fix tests

Author: josibake

test/scenarios_test.py

@@ -7,7 +7,7 @@
 
 from warnet.k8s import delete_pod
 from warnet.process import run_command
-from warnet.scenarios import _active as scenarios_active
+from warnet.status import _get_active_scenarios as scenarios_active
 
 
 class ScenariosTest(TestBase):
@@ -36,7 +36,7 @@ def scenario_running(self, scenario_name: str):
         """Check that we are only running a single scenario of the correct name"""
         active = scenarios_active()
         assert len(active) == 1
-        return scenario_name in active[0]["commander"]
+        return scenario_name in active[0]["name"]
 
     def run_and_check_scenario_from_file(self):
         scenario_file = "test/data/scenario_p2p_interface.py"
@@ -80,7 +80,7 @@ def stop_scenario(self):
         running = scenarios_active()
         assert len(running) == 1, f"Expected one running scenario, got {len(running)}"
         assert running[0]["status"] == "running", "Scenario should be running"
-        delete_pod(running[0]["commander"])
+        delete_pod(running[0]["name"])
         self.wait_for_predicate(self.check_scenario_stopped)
 
     def check_scenario_stopped(self):

test/test_base.py

@@ -14,7 +14,7 @@
 from warnet.control import get_active_scenarios
 from warnet.k8s import get_pod_exit_status
 from warnet.network import _connected as network_connected
-from warnet.network import _status as network_status
+from warnet.status import _get_tank_status as network_status
 
 
 class TestBase:
@@ -112,11 +112,9 @@ def check_status():
             if len(tanks) == 0:
                 return True
             for tank in tanks:
-                for service in ["bitcoin", "lightning", "circuitbreaker"]:
-                    status = tank.get(f"{service}_status")
-                    if status:
-                        stats["total"] += 1
-                        stats[status] = stats.get(status, 0) + 1
+                status = tank["status"]
+                stats["total"] += 1
+                stats[status] = stats.get(status, 0) + 1
             self.log.info(f"Waiting for all tanks to reach '{target}': {stats}")
             return target in stats and stats[target] == stats["total"]