Fixes a logback blaming for multiple configs

UnitsNetwork · Oct 4, 2024 · 849e595 · 849e595
1 parent 39beb63
commit 849e595
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -23,7 +23,7 @@ inScope(Global)(
       "-Ywarn-unused:-implicits",
       "-Xlint"
     ),
-    javacOptions ++= Seq(
+    javaOptions ++= Seq(
       "-Dfile.encoding=UTF-8" // JVM default charset for proper and deterministic getBytes behaviour
     )
   )

diff --git a/consensus-client-it/build.sbt b/consensus-client-it/build.sbt
@@ -3,6 +3,9 @@ libraryDependencies ++= Seq(
 )
 
 Test / fork := true
+Test / javaOptions ++= Seq(
+  s"-Dlogback.configurationFile=${(Test / resourceDirectory).value}/logback-test.xml" // Fixes a logback blaming for multiple configs
+)
 Test / envVars ++= Map(
   "CONFIGS_DIR" -> s"${baseDirectory.value}/../local-network/configs",
   "LOGS_DIR"    -> s"${target.value}/test-logs"

diff --git a/consensus-client-it/src/test/scala/units/network/BaseItTestSuite.scala b/consensus-client-it/src/test/scala/units/network/BaseItTestSuite.scala
@@ -15,7 +15,7 @@ import java.nio.charset.StandardCharsets
 trait BaseItTestSuite extends AnyFreeSpec with ScorexLogging with BeforeAndAfterAll with EitherValues with OptionValues with CustomMatchers {
   protected lazy val network = Networks.network
 
-  protected lazy val ec1: EcContainer = new EcContainer(network, "ec-1", Networks.ipForNode(2))
+  protected lazy val ec1: EcContainer = new EcContainer(network, "ec-1", Networks.ipForNode(2)) // ipForNode(1) is assigned to Ryuk
   protected lazy val waves1: WavesNodeContainer = new WavesNodeContainer(
     network = network,
     number = 1,