From 815ce15f5f5b8be21d80b7a8e80e262391ccde7e Mon Sep 17 00:00:00 2001
From: pm47 <pm.padiou@gmail.com>
Date: Thu, 16 Mar 2017 16:46:54 +0100
Subject: [PATCH] temporary test files are now written to target/ directory

---
 .gitignore                                                    | 2 --
 eclair-node/src/test/resources/logback-test.xml               | 4 ++--
 .../fr/acinq/eclair/interop/rustytests/RustyTestsSpec.scala   | 2 +-
 .../acinq/eclair/interop/rustytests/SynchronizationPipe.scala | 3 ++-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 10d408ad..3a8bc26b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,5 +25,3 @@ target/
 project/target
 DeleteMe*.*
 *~
-
-result.txt
diff --git a/eclair-node/src/test/resources/logback-test.xml b/eclair-node/src/test/resources/logback-test.xml
index f4511a71..fcb55ca2 100644
--- a/eclair-node/src/test/resources/logback-test.xml
+++ b/eclair-node/src/test/resources/logback-test.xml
@@ -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"/>
diff --git a/eclair-node/src/test/scala/fr/acinq/eclair/interop/rustytests/RustyTestsSpec.scala b/eclair-node/src/test/scala/fr/acinq/eclair/interop/rustytests/RustyTestsSpec.scala
index bfed525f..f4e49ce6 100644
--- a/eclair-node/src/test/scala/fr/acinq/eclair/interop/rustytests/RustyTestsSpec.scala
+++ b/eclair-node/src/test/scala/fr/acinq/eclair/interop/rustytests/RustyTestsSpec.scala
@@ -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))
   }
 
diff --git a/eclair-node/src/test/scala/fr/acinq/eclair/interop/rustytests/SynchronizationPipe.scala b/eclair-node/src/test/scala/fr/acinq/eclair/interop/rustytests/SynchronizationPipe.scala
index 6b2396dc..2ec8db82 100644
--- a/eclair-node/src/test/scala/fr/acinq/eclair/interop/rustytests/SynchronizationPipe.scala
+++ b/eclair-node/src/test/scala/fr/acinq/eclair/interop/rustytests/SynchronizationPipe.scala
@@ -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