temporary test files are now written to target/ directory

This commit is contained in:
pm47 2017-03-16 16:46:54 +01:00
parent db342e8db3
commit 815ce15f5f
4 changed files with 5 additions and 6 deletions

2
.gitignore vendored
View File

@ -25,5 +25,3 @@ target/
project/target
DeleteMe*.*
*~
result.txt

View File

@ -18,13 +18,13 @@
</encoder>
</appender-->
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<!--appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>eclair.log</file>
<append>false</append>
<encoder>
<pattern>%-5level %X{akkaSource} - %msg%ex{12}%n</pattern>
</encoder>
</appender>
</appender-->
<logger name="fr.acinq.eclair.Pipe" level="DEBUG">
<appender-ref ref="CONSOLE"/>

View File

@ -51,7 +51,7 @@ class RustyTestsSpec extends TestKit(ActorSystem("test")) with Matchers with fix
pipe ! new File(getClass.getResource(s"/scenarii/${test.name}.script").getFile)
latch.await(30, TimeUnit.SECONDS)
val ref = Source.fromFile(getClass.getResource(s"/scenarii/${test.name}.script.expected").getFile).getLines().filterNot(_.startsWith("#")).toList
val res = Source.fromFile(new File("result.txt")).getLines().filterNot(_.startsWith("#")).toList
val res = Source.fromFile(new File(s"${System.getProperty("buildDirectory")}/result.tmp")).getLines().filterNot(_.startsWith("#")).toList
test((ref, res))
}

View File

@ -1,6 +1,7 @@
package fr.acinq.eclair.interop.rustytests
import java.io.{BufferedWriter, File, FileWriter}
import java.util.UUID
import java.util.concurrent.CountDownLatch
import akka.actor.{Actor, ActorLogging, ActorRef, Stash}
@ -32,7 +33,7 @@ class SynchronizationPipe(latch: CountDownLatch) extends Actor with ActorLogging
val echo = "echo (.*)".r
val dump = "(.):dump".r
val fout = new BufferedWriter(new FileWriter("result.txt"))
val fout = new BufferedWriter(new FileWriter(s"${System.getProperty("buildDirectory")}/result.tmp"))
def exec(script: List[String], a: ActorRef, b: ActorRef): Unit = {
def resolve(x: String) = if (x == "A") a else b