From c1a3bd8fee464661ebfa842922c3a4c4e82a915f Mon Sep 17 00:00:00 2001
From: Tanguy <tanguy@status.im>
Date: Wed, 1 Mar 2023 16:59:44 +0100
Subject: [PATCH] Fix pubsub CI logs (#861)

---
 tests/config.nims        | 10 ++++++----
 tests/pubsub/config.nims |  9 +++++++++
 tests/stublogger.nim     | 17 +++++++++--------
 3 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 tests/pubsub/config.nims

diff --git a/tests/config.nims b/tests/config.nims
index c98d159..d108df2 100644
--- a/tests/config.nims
+++ b/tests/config.nims
@@ -1,5 +1,5 @@
 import ../config.nims
-import strutils
+import strutils, os
 
 --threads:on
 --d:metrics
@@ -8,18 +8,20 @@ import strutils
 --d:libp2p_protobuf_metrics
 --d:libp2p_network_protocols_metrics
 --d:libp2p_mplex_metrics
+--skipParentCfg
 
 # Only add chronicles param if the
 # user didn't specify any
 var hasChroniclesParam = false
-for param in 0..<paramCount():
-  if "chronicles" in paramStr(param):
+for param in 0..<system.paramCount():
+  if "chronicles" in system.paramStr(param):
     hasChroniclesParam = true
 
 if hasChroniclesParam:
   echo "Since you specified chronicles params, TRACE won't be tested!"
 else:
-  switch("import", "stublogger")
+  let modulePath = currentSourcePath.parentDir / "stublogger"
+  switch("import", modulePath)
   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/config.nims b/tests/pubsub/config.nims
new file mode 100644
index 0000000..5662c5d
--- /dev/null
+++ b/tests/pubsub/config.nims
@@ -0,0 +1,9 @@
+import strutils
+
+proc hasSkipParentCfg: bool =
+  for param in 0..<paramCount():
+    if "skipParent" in paramStr(param):
+      return true
+
+when hasSkipParentCfg():
+  import ../config.nims
diff --git a/tests/stublogger.nim b/tests/stublogger.nim
index 11a1168..8ca0448 100644
--- a/tests/stublogger.nim
+++ b/tests/stublogger.nim
@@ -1,12 +1,13 @@
-import std/typetraits
-import chronicles
+when not defined(nimscript):
+  import std/typetraits
+  import chronicles
 
-when defined(chronicles_runtime_filtering):
-  setLogLevel(INFO)
+  when defined(chronicles_runtime_filtering):
+    setLogLevel(INFO)
 
-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
+  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
 
 {.used.}