test: cover defaultConfig / config options when creating network

Author: pinheadmz

.github/workflows/test.yml

@@ -38,6 +38,7 @@ jobs:
         test:
           - conf_test.py
           - dag_connection_test.py
+          - graph_test.py
           - logging_test.py
           - rpc_test.py
           - services_test.py
@@ -87,24 +88,3 @@ jobs:
           name: kubernetes-logs-${{ matrix.test }}
           path: ./k8s-logs
           retention-days: 5
-  test-without-mk:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        test:
-          - graph_test.py
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v2
-        with:
-          version: "latest"
-          enable-cache: true
-      - name: Install Python
-        run: uv python install $PYTHON_VERSION
-      - name: Install project
-        run: uv sync --all-extras --dev
-      - name: Run tests
-        run: |
-          source .venv/bin/activate
-          ./test/${{matrix.test}}

test/graph_test.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
+import json
 import os
-import shutil
 
 import pexpect
 from test_base import TestBase
@@ -15,34 +15,65 @@ def __init__(self):
 
     def run_test(self):
         try:
+            # cwd out of the git repo for remainder of script
+            os.chdir(self.tmpdir)
             self.directory_not_exist()
             os.mkdir(NETWORKS_DIR)
             self.directory_exists()
-
+            self.run_created_network()
         finally:
-            shutil.rmtree(NETWORKS_DIR) if os.path.exists(NETWORKS_DIR) else None
+            self.cleanup()
 
     def directory_not_exist(self):
-        self.sut = pexpect.spawn("warnet create")
-        self.sut.expect("init", timeout=50)
+        try:
+            self.log.info("testing warnet create, dir doesn't exist")
+            self.sut = pexpect.spawn("warnet create")
+            self.sut.expect("init", timeout=10)
+        except Exception as e:
+            print(f"\nReceived prompt text:\n  {self.sut.before.decode('utf-8')}\n")
+            raise e
 
     def directory_exists(self):
-        self.sut = pexpect.spawn("warnet create")
-        self.sut.expect("name", timeout=10)
-        self.sut.sendline("ANewNetwork")
-        self.sut.expect("many", timeout=10)
-        self.sut.sendline("")
-        self.sut.expect("connections", timeout=10)
-        self.sut.sendline("")
-        self.sut.expect("version", timeout=10)
-        self.sut.sendline("")
-        self.sut.expect("enable fork-observer", timeout=10)
-        self.sut.sendline("")
-        self.sut.expect("seconds", timeout=10)
-        self.sut.sendline("")
-        self.sut.expect("enable grafana", timeout=10)
-        self.sut.sendline("")
-        self.sut.expect("successfully", timeout=50)
+        try:
+            self.log.info("testing warnet create, dir does exist")
+            self.sut = pexpect.spawn("warnet create")
+            self.sut.expect("name", timeout=10)
+            self.sut.sendline("ANewNetwork")
+            self.sut.expect("many", timeout=10)
+            self.sut.sendline("")
+            self.sut.expect("connections", timeout=10)
+            self.sut.sendline("")
+            self.sut.expect("version", timeout=10)
+            self.sut.sendline("")
+            self.sut.expect("enable fork-observer", timeout=10)
+            self.sut.sendline("")
+            self.sut.expect("seconds", timeout=10)
+            self.sut.sendline("")
+            self.sut.expect("enable grafana", timeout=10)
+            self.sut.sendline("")
+            self.sut.expect("successfully", timeout=50)
+        except Exception as e:
+            print(f"\nReceived prompt text:\n  {self.sut.before.decode('utf-8')}\n")
+            raise e
+
+    def run_created_network(self):
+        self.log.info("adding custom config to one tank")
+        with open("networks/ANewNetwork/network.yaml") as f:
+            s = f.read()
+        s = s.replace("  name: tank-0000\n", "  name: tank-0000\n  config: debug=mempool\n")
+        with open("networks/ANewNetwork/network.yaml", "w") as f:
+            f.write(s)
+
+        self.log.info("deploying new network")
+        self.warnet("deploy networks/ANewNetwork")
+        self.wait_for_all_tanks_status(target="running")
+        debugs = json.loads(self.warnet("bitcoin rpc tank-0000 logging"))
+        # set in defaultConfig
+        assert debugs["rpc"]
+        # set in config just for this tank
+        assert debugs["mempool"]
+        # santy check
+        assert not debugs["zmq"]
 
 
 if __name__ == "__main__":

test/test_base.py

@@ -39,6 +39,7 @@ def setup_logging(self):
         logging.config.dictConfig(logging_config)
         self.log = logging.getLogger("test")
         self.log.info("Logging started")
+        self.log.info(f"Testdir: {self.tmpdir}")
 
     def cleanup(self, signum=None, frame=None):
         try: