From f14ada3dcf966b4d265a423bcf6a43fa360c5d20 Mon Sep 17 00:00:00 2001
From: Tanguy <tanguy@status.im>
Date: Fri, 10 Feb 2023 11:32:21 +0100
Subject: [PATCH] Move tests flags from 'nimble test' to 'config.nims' (#852)

---
 libp2p.nimble                       |  4 +---
 tests/config.nims                   | 20 ++++++++++++++++++++
 tests/pubsub/testgossipinternal.nim |  1 -
 tests/pubsub/testpubsub.nim         |  2 --
 tests/stublogger.nim                |  4 +++-
 tests/testdaemon.nim                |  2 +-
 tests/testinterop.nim               |  2 --
 tests/testnative.nim                |  2 --
 tests/testpkifilter.nim             |  1 -
 9 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/libp2p.nimble b/libp2p.nimble
index 2644f6fef..f67aad57f 100644
--- a/libp2p.nimble
+++ b/libp2p.nimble
@@ -22,9 +22,7 @@ requires "nim >= 1.2.0",
 import hashes
 proc runTest(filename: string, verify: bool = true, sign: bool = true,
              moreoptions: string = "") =
-  var excstr = "nim c --skipParentCfg --opt:speed -d:debug -d:libp2p_agents_metrics -d:libp2p_protobuf_metrics -d:libp2p_network_protocols_metrics -d:libp2p_mplex_metrics "
-  excstr.add(" -d:chronicles_sinks=textlines[stdout],json[dynamic] -d:chronicles_log_level=TRACE ")
-  excstr.add(" -d:chronicles_runtime_filtering=TRUE ")
+  var excstr = "nim c --skipParentCfg --opt:speed -d:debug "
   excstr.add(" " & getEnv("NIMFLAGS") & " ")
   excstr.add(" --verbosity:0 --hints:off ")
   excstr.add(" -d:libp2p_pubsub_sign=" & $sign)
diff --git a/tests/config.nims b/tests/config.nims
index ab493670d..c98d15909 100644
--- a/tests/config.nims
+++ b/tests/config.nims
@@ -1,5 +1,25 @@
 import ../config.nims
+import strutils
 
 --threads:on
 --d:metrics
 --d:withoutPCRE
+--d:libp2p_agents_metrics
+--d:libp2p_protobuf_metrics
+--d:libp2p_network_protocols_metrics
+--d:libp2p_mplex_metrics
+
+# Only add chronicles param if the
+# user didn't specify any
+var hasChroniclesParam = false
+for param in 0..<paramCount():
+  if "chronicles" in paramStr(param):
+    hasChroniclesParam = true
+
+if hasChroniclesParam:
+  echo "Since you specified chronicles params, TRACE won't be tested!"
+else:
+  switch("import", "stublogger")
+  switch("define", "chronicles_sinks=textlines[stdout],json[dynamic]")
+  switch("define", "chronicles_log_level=TRACE")
+  switch("define", "chronicles_runtime_filtering=TRUE")
diff --git a/tests/pubsub/testgossipinternal.nim b/tests/pubsub/testgossipinternal.nim
index 91ad4c0f5..aa16b03d0 100644
--- a/tests/pubsub/testgossipinternal.nim
+++ b/tests/pubsub/testgossipinternal.nim
@@ -3,7 +3,6 @@ include ../../libp2p/protocols/pubsub/gossipsub
 {.used.}
 
 import options
-import ../stublogger
 import stew/byteutils
 import ../../libp2p/builders
 import ../../libp2p/errors
diff --git a/tests/pubsub/testpubsub.nim b/tests/pubsub/testpubsub.nim
index 08b9abaae..c33e6e7d0 100644
--- a/tests/pubsub/testpubsub.nim
+++ b/tests/pubsub/testpubsub.nim
@@ -1,7 +1,5 @@
 {.used.}
 
-import ../stublogger
-
 import testfloodsub,
        testgossipsub,
        testgossipsub2,
diff --git a/tests/stublogger.nim b/tests/stublogger.nim
index ef796c375..11a11687f 100644
--- a/tests/stublogger.nim
+++ b/tests/stublogger.nim
@@ -7,4 +7,6 @@ when defined(chronicles_runtime_filtering):
 when defaultChroniclesStream.outputs.type.arity == 1:
   # Hide the json logs, they're just here to check if we compile
   proc noOutput(logLevel: LogLevel, msg: LogOutputStr) = discard
-  defaultChroniclesStream.outputs[0].writer = noOutput
\ No newline at end of file
+  defaultChroniclesStream.outputs[0].writer = noOutput
+
+{.used.}
diff --git a/tests/testdaemon.nim b/tests/testdaemon.nim
index 10b80a29b..5c1da3d8b 100644
--- a/tests/testdaemon.nim
+++ b/tests/testdaemon.nim
@@ -1,4 +1,4 @@
-import chronos, unittest2, helpers, stublogger
+import chronos, unittest2, helpers
 import ../libp2p/daemon/daemonapi, ../libp2p/multiaddress, ../libp2p/multicodec,
        ../libp2p/cid, ../libp2p/multihash, ../libp2p/peerid
 
diff --git a/tests/testinterop.nim b/tests/testinterop.nim
index 8c9f7110d..b53b5afdd 100644
--- a/tests/testinterop.nim
+++ b/tests/testinterop.nim
@@ -1,5 +1,3 @@
-import stublogger
-
 import helpers, commoninterop
 import ../libp2p
 import ../libp2p/crypto/crypto, ../libp2p/protocols/connectivity/relay/[relay, client]
diff --git a/tests/testnative.nim b/tests/testnative.nim
index b6768e72a..b41508160 100644
--- a/tests/testnative.nim
+++ b/tests/testnative.nim
@@ -1,5 +1,3 @@
-import stublogger
-
 import testvarint,
        testconnection,
        testminprotobuf,
diff --git a/tests/testpkifilter.nim b/tests/testpkifilter.nim
index d2c862b89..7a6cb86f2 100644
--- a/tests/testpkifilter.nim
+++ b/tests/testpkifilter.nim
@@ -9,7 +9,6 @@
 when defined(nimHasUsed): {.used.}
 
 import unittest2
-import stublogger
 import ../libp2p/crypto/crypto
 import nimcrypto/utils