project: exclude test scenarios

Author: pinheadmz

resources/networks/6_node_bitcoin/network.yaml

@@ -28,7 +28,5 @@ nodes:
     connect:
       - tank-0006
   - name: tank-0006
-fork_observer:
-  enabled: true
 caddy:
   enabled: true

resources/networks/node-defaults.yaml renamed to resources/networks/fork_observer/node-defaults.yaml

@@ -74,7 +74,7 @@ def custom_graph(
         yaml.dump(network_yaml_data, f, default_flow_style=False)
 
     # Generate node-defaults.yaml
-    default_yaml_path = files("resources.networks").joinpath("node-defaults.yaml")
+    default_yaml_path = files("resources.networks").joinpath("fork_observer").joinpath("node-defaults.yaml")
     with open(str(default_yaml_path)) as f:
         defaults_yaml_content = yaml.safe_load(f)
 

src/warnet/graph.py

@@ -1,4 +1,5 @@
 import json
+import re
 import shutil
 from pathlib import Path
 
@@ -18,17 +19,12 @@ def copy_defaults(directory: Path, target_subdir: str, source_path: Path, exclud
     target_dir.mkdir(parents=True, exist_ok=True)
     print(f"Creating directory: {target_dir}")
 
-    def should_copy(item: Path) -> bool:
-        return item.name not in exclude_list
-
-    for item in source_path.iterdir():
-        if should_copy(item):
-            if item.is_file():
-                shutil.copy2(item, target_dir)
-                print(f"Copied file: {item.name}")
-            elif item.is_dir():
-                shutil.copytree(item, target_dir / item.name, dirs_exist_ok=True)
-                print(f"Copied directory: {item.name}")
+    shutil.copytree(
+        src=source_path,
+        dst=target_dir,
+        dirs_exist_ok=True,
+        ignore=shutil.ignore_patterns(*exclude_list)
+    )
 
     print(f"Finished copying files to {target_dir}")
 
@@ -39,7 +35,7 @@ def copy_network_defaults(directory: Path):
         directory,
         NETWORK_DIR.name,
         NETWORK_DIR,
-        ["node-defaults.yaml", "__pycache__", "__init__.py"],
+        ["__pycache__", "__init__.py"],
     )
 
 
@@ -49,7 +45,7 @@ def copy_scenario_defaults(directory: Path):
         directory,
         SCENARIOS_DIR.name,
         SCENARIOS_DIR,
-        ["__init__.py", "__pycache__", "commander.py"],
+        ["__pycache__", "TEST_*.py"],
     )
 
 

src/warnet/network.py

@@ -26,7 +26,7 @@ def setup_network(self):
 
     def run_connect_dag_scenario(self):
         self.log.info("Running connect_dag scenario")
-        self.warnet("run resources/scenarios/test_connect_dag.py")
+        self.warnet("run resources/scenarios/TEST_connect_dag.py")
         self.wait_for_all_scenarios()
 
 

test/dag_connection_test.py

@@ -82,7 +82,7 @@ def run_and_check_miner_scenario_from_file(self):
         self.stop_scenario()
 
     def run_and_check_scenario_from_file(self):
-        scenario_file = "resources/scenarios/test_p2p_interface.py"
+        scenario_file = "resources/scenarios/TEST_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)
@@ -94,7 +94,7 @@ def check_regtest_recon(self):
         self.wait_for_predicate(self.check_scenario_clean_exit)
 
     def check_active_count(self):
-        scenario_file = "resources/scenarios/test_buggy_failure.py"
+        scenario_file = "resources/scenarios/TEST_buggy_failure.py"
         self.log.info(f"Running scenario from: {scenario_file}")
         self.warnet(f"run {scenario_file}")