Fix aggregate

Author: Bojan131

tests/mainnet/Base_Mainnet.py

@@ -120,23 +120,11 @@ def log_error(error, node_name, step='unknown', remote_node=None):
     node_error_file = f"test_output/errors_{node_name.replace(' ', '_')}.json"
     os.makedirs("test_output", exist_ok=True)
 
-    # Load existing errors for this node
-    if os.path.exists(node_error_file):
-        with open(node_error_file, 'r') as f:
-            try:
-                node_errors = json.load(f)
-            except:
-                node_errors = {}
-    else:
-        node_errors = {}
+    # Use the in-memory error_stats as the source of truth for this node
+    # This ensures we only track errors from the current test run
+    node_errors = error_stats.get(node_name, {}).copy()
 
-    # Update errors for this node
-    if key in node_errors:
-        node_errors[key] += 1
-    else:
-        node_errors[key] = 1
-    
-    # Save back to individual node file
+    # Save current state to individual node file
     with open(node_error_file, 'w') as f:
         json.dump(node_errors, f, indent=2)
 
@@ -275,21 +263,6 @@ def avg(times): return round(sum(times) / len(times), 2) if times else 0.0
     with open(f"test_output/summary_{name.replace(' ', '_')}.json", "w") as f:
         json.dump(summary, f, indent=2)
 
-    # Write error file by merging with existing errors from the aggregated file
-    error_file = "test_output/error_stats.json"
-    if os.path.exists(error_file):
-        with open(error_file, 'r') as f:
-            try:
-                all_errors = json.load(f)
-                node_errors = all_errors.get(name, {})
-            except:
-                node_errors = {}
-    else:
-        node_errors = {}
-    
-    with open(f"test_output/errors_{name.replace(' ', '_')}.json", "w") as f:
-        json.dump(node_errors, f, indent=2)
-
     print(f"\n──────────── Summary for {name} ────────────")
     if failed_assets:
         print("🔍 Failed Assets:")

tests/mainnet/Gnosis_Mainnet.py

@@ -120,23 +120,11 @@ def log_error(error, node_name, step='unknown', remote_node=None):
     node_error_file = f"test_output/errors_{node_name.replace(' ', '_')}.json"
     os.makedirs("test_output", exist_ok=True)
 
-    # Load existing errors for this node
-    if os.path.exists(node_error_file):
-        with open(node_error_file, 'r') as f:
-            try:
-                node_errors = json.load(f)
-            except:
-                node_errors = {}
-    else:
-        node_errors = {}
+    # Use the in-memory error_stats as the source of truth for this node
+    # This ensures we only track errors from the current test run
+    node_errors = error_stats.get(node_name, {}).copy()
 
-    # Update errors for this node
-    if key in node_errors:
-        node_errors[key] += 1
-    else:
-        node_errors[key] = 1
-    
-    # Save back to individual node file
+    # Save current state to individual node file
     with open(node_error_file, 'w') as f:
         json.dump(node_errors, f, indent=2)
 
@@ -275,21 +263,6 @@ def avg(times): return round(sum(times) / len(times), 2) if times else 0.0
     with open(f"test_output/summary_{name.replace(' ', '_')}.json", "w") as f:
         json.dump(summary, f, indent=2)
 
-    # Write error file by merging with existing errors from the aggregated file
-    error_file = "test_output/error_stats.json"
-    if os.path.exists(error_file):
-        with open(error_file, 'r') as f:
-            try:
-                all_errors = json.load(f)
-                node_errors = all_errors.get(name, {})
-            except:
-                node_errors = {}
-    else:
-        node_errors = {}
-    
-    with open(f"test_output/errors_{name.replace(' ', '_')}.json", "w") as f:
-        json.dump(node_errors, f, indent=2)
-
     print(f"\n──────────── Summary for {name} ────────────")
     if failed_assets:
         print("🔍 Failed Assets:")

tests/mainnet/Neuroweb_Mainnet.py

@@ -120,23 +120,11 @@ def log_error(error, node_name, step='unknown', remote_node=None):
     node_error_file = f"test_output/errors_{node_name.replace(' ', '_')}.json"
     os.makedirs("test_output", exist_ok=True)
 
-    # Load existing errors for this node
-    if os.path.exists(node_error_file):
-        with open(node_error_file, 'r') as f:
-            try:
-                node_errors = json.load(f)
-            except:
-                node_errors = {}
-    else:
-        node_errors = {}
+    # Use the in-memory error_stats as the source of truth for this node
+    # This ensures we only track errors from the current test run
+    node_errors = error_stats.get(node_name, {}).copy()
 
-    # Update errors for this node
-    if key in node_errors:
-        node_errors[key] += 1
-    else:
-        node_errors[key] = 1
-    
-    # Save back to individual node file
+    # Save current state to individual node file
     with open(node_error_file, 'w') as f:
         json.dump(node_errors, f, indent=2)
 
@@ -274,21 +262,6 @@ def avg(times): return round(sum(times) / len(times), 2) if times else 0.0
     os.makedirs("test_output", exist_ok=True)
     with open(f"test_output/summary_{name.replace(' ', '_')}.json", "w") as f:
         json.dump(summary, f, indent=2)
-    
-    # Write error file by merging with existing errors from the aggregated file
-    error_file = "test_output/error_stats.json"
-    if os.path.exists(error_file):
-        with open(error_file, 'r') as f:
-            try:
-                all_errors = json.load(f)
-                node_errors = all_errors.get(name, {})
-            except:
-                node_errors = {}
-    else:
-        node_errors = {}
-    
-    with open(f"test_output/errors_{name.replace(' ', '_')}.json", "w") as f:
-        json.dump(node_errors, f, indent=2)
 
     print(f"\n──────────── Summary for {name} ────────────")
     if failed_assets:

tests/mainnet/conftest.py

@@ -25,6 +25,10 @@ def setup_test_environment():
     # Create test_output directory if it doesn't exist
     os.makedirs("test_output", exist_ok=True)
 
+    # Clear global dictionaries to prevent errors from previous runs
+    global_stats.clear()
+    error_stats.clear()
+    
     # Clear error files at the start of each test run to show only current run errors
     error_files_to_clear = [
         "test_output/error_stats.json",

tests/testnet/Base_Testnet.py

@@ -125,23 +125,11 @@ def log_error(error, node_name, step='unknown', remote_node=None):
     node_error_file = f"test_output/errors_{node_name.replace(' ', '_')}.json"
     os.makedirs("test_output", exist_ok=True)
 
-    # Load existing errors for this node
-    if os.path.exists(node_error_file):
-        with open(node_error_file, 'r') as f:
-            try:
-                node_errors = json.load(f)
-            except:
-                node_errors = {}
-    else:
-        node_errors = {}
-    
-    # Update errors for this node
-    if key in node_errors:
-        node_errors[key] += 1
-    else:
-        node_errors[key] = 1
+    # Use the in-memory error_stats as the source of truth for this node
+    # This ensures we only track errors from the current test run
+    node_errors = error_stats.get(node_name, {}).copy()
 
-    # Save back to individual node file
+    # Save current state to individual node file
     with open(node_error_file, 'w') as f:
         json.dump(node_errors, f, indent=2)
 

tests/testnet/Gnosis_Testnet.py

@@ -125,23 +125,11 @@ def log_error(error, node_name, step='unknown', remote_node=None):
     node_error_file = f"test_output/errors_{node_name.replace(' ', '_')}.json"
     os.makedirs("test_output", exist_ok=True)
 
-    # Load existing errors for this node
-    if os.path.exists(node_error_file):
-        with open(node_error_file, 'r') as f:
-            try:
-                node_errors = json.load(f)
-            except:
-                node_errors = {}
-    else:
-        node_errors = {}
-    
-    # Update errors for this node
-    if key in node_errors:
-        node_errors[key] += 1
-    else:
-        node_errors[key] = 1
+    # Use the in-memory error_stats as the source of truth for this node
+    # This ensures we only track errors from the current test run
+    node_errors = error_stats.get(node_name, {}).copy()
 
-    # Save back to individual node file
+    # Save current state to individual node file
     with open(node_error_file, 'w') as f:
         json.dump(node_errors, f, indent=2)
 

tests/testnet/Neuroweb_Testnet.py

@@ -125,23 +125,11 @@ def log_error(error, node_name, step='unknown', remote_node=None):
     node_error_file = f"test_output/errors_{node_name.replace(' ', '_')}.json"
     os.makedirs("test_output", exist_ok=True)
 
-    # Load existing errors for this node
-    if os.path.exists(node_error_file):
-        with open(node_error_file, 'r') as f:
-            try:
-                node_errors = json.load(f)
-            except:
-                node_errors = {}
-    else:
-        node_errors = {}
-    
-    # Update errors for this node
-    if key in node_errors:
-        node_errors[key] += 1
-    else:
-        node_errors[key] = 1
+    # Use the in-memory error_stats as the source of truth for this node
+    # This ensures we only track errors from the current test run
+    node_errors = error_stats.get(node_name, {}).copy()
 
-    # Save back to individual node file
+    # Save current state to individual node file
     with open(node_error_file, 'w') as f:
         json.dump(node_errors, f, indent=2)
 

tests/testnet/conftest.py

@@ -25,6 +25,10 @@ def setup_test_environment():
     # Create test_output directory if it doesn't exist
     os.makedirs("test_output", exist_ok=True)
 
+    # Clear global dictionaries to prevent errors from previous runs
+    global_stats.clear()
+    error_stats.clear()
+    
     # Clear error files at the start of each test run to show only current run errors
     error_files_to_clear = [
         "test_output/error_stats.json",