test: reorganize scenarios_test (noop)

Author: pinheadmz

test/scenarios_test.py

@@ -18,7 +18,9 @@ def __init__(self):
     def run_test(self):
         try:
             self.setup_network()
-            self.test_scenarios()
+            self.run_and_check_miner_scenario_from_file()
+            self.run_and_check_scenario_from_file()
+            self.check_regtest_recon()
         finally:
             self.cleanup()
 
@@ -28,42 +30,29 @@ def setup_network(self):
         self.wait_for_all_tanks_status(target="running")
         self.wait_for_all_edges()
 
-    def test_scenarios(self):
-        self.run_and_check_miner_scenario_from_file()
-        self.run_and_check_scenario_from_file()
-        self.check_regtest_recon()
-
     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]["name"]
 
-    def run_and_check_scenario_from_file(self):
-        scenario_file = "test/data/scenario_p2p_interface.py"
-        self.log.info(f"Running scenario from: {scenario_file}")
-        self.warnet(f"run {scenario_file}")
-        self.wait_for_predicate(self.check_scenario_clean_exit)
-
-    def run_and_check_miner_scenario_from_file(self):
-        scenario_file = "resources/scenarios/miner_std.py"
-        self.log.info(f"Running scenario from file: {scenario_file}")
-        self.warnet(f"run {scenario_file} --allnodes --interval=1")
-        start = int(self.warnet("bitcoin rpc tank-0000 getblockcount"))
-        self.wait_for_predicate(lambda: self.scenario_running("commander-minerstd"))
-        self.wait_for_predicate(lambda: self.check_blocks(2, start=start))
-        self.stop_scenario()
-
-    def check_regtest_recon(self):
-        scenario_file = "resources/scenarios/reconnaissance.py"
-        self.log.info(f"Running scenario from file: {scenario_file}")
-        self.warnet(f"run {scenario_file}")
-        self.wait_for_predicate(self.check_scenario_clean_exit)
+    def check_scenario_stopped(self):
+        running = scenarios_active()
+        self.log.debug(f"Checking if scenario stopped. Running scenarios: {len(running)}")
+        return len(running) == 0
 
     def check_scenario_clean_exit(self):
         active = scenarios_active()
         return all(scenario["status"] == "succeeded" for scenario in active)
 
+    def stop_scenario(self):
+        self.log.info("Stopping running scenario")
+        running = scenarios_active()
+        assert len(running) == 1, f"Expected one running scenario, got {len(running)}"
+        assert running[0]["status"] == "running", "Scenario should be running"
+        stop_scenario(running[0]["name"])
+        self.wait_for_predicate(self.check_scenario_stopped)
+
     def check_blocks(self, target_blocks, start: int = 0):
         count = int(self.warnet("bitcoin rpc tank-0000 getblockcount"))
         self.log.debug(f"Current block count: {count}, target: {start + target_blocks}")
@@ -80,18 +69,26 @@ def check_blocks(self, target_blocks, start: int = 0):
 
         return count >= start + target_blocks
 
-    def stop_scenario(self):
-        self.log.info("Stopping running scenario")
-        running = scenarios_active()
-        assert len(running) == 1, f"Expected one running scenario, got {len(running)}"
-        assert running[0]["status"] == "running", "Scenario should be running"
-        stop_scenario(running[0]["name"])
-        self.wait_for_predicate(self.check_scenario_stopped)
+    def run_and_check_miner_scenario_from_file(self):
+        scenario_file = "resources/scenarios/miner_std.py"
+        self.log.info(f"Running scenario from file: {scenario_file}")
+        self.warnet(f"run {scenario_file} --allnodes --interval=1")
+        start = int(self.warnet("bitcoin rpc tank-0000 getblockcount"))
+        self.wait_for_predicate(lambda: self.scenario_running("commander-minerstd"))
+        self.wait_for_predicate(lambda: self.check_blocks(2, start=start))
+        self.stop_scenario()
 
-    def check_scenario_stopped(self):
-        running = scenarios_active()
-        self.log.debug(f"Checking if scenario stopped. Running scenarios: {len(running)}")
-        return len(running) == 0
+    def run_and_check_scenario_from_file(self):
+        scenario_file = "test/data/scenario_p2p_interface.py"
+        self.log.info(f"Running scenario from: {scenario_file}")
+        self.warnet(f"run {scenario_file}")
+        self.wait_for_predicate(self.check_scenario_clean_exit)
+
+    def check_regtest_recon(self):
+        scenario_file = "resources/scenarios/reconnaissance.py"
+        self.log.info(f"Running scenario from file: {scenario_file}")
+        self.warnet(f"run {scenario_file}")
+        self.wait_for_predicate(self.check_scenario_clean_exit)
 
 
 if __name__ == "__main__":