some tests dont run

2026-01-17 05:50:14 +01:00 · 2025-05-02 16:57:58 +02:00
parent bccdc32d4b
commit 5df8dfe68d
1 changed files with 1 additions and 7 deletions
--- a/tests/scripts/test_simulators.py
+++ b/tests/scripts/test_simulators.py
@@ -199,15 +199,9 @@ with open(fname, 'w') as fp:
    Log(Fore.BLUE, 'General tests (results: ' + file_results + ')')

    try:
-<<<<<<< HEAD
-        killAllStaleProcesses(fp)
+        cleanup(fp)
        startGeneralTests(fp, file_results)
        
-=======
-        startGeneralTests(fp, file_results)
-        cleanup(fp)
-
->>>>>>> developer
        testError = False
        for server in servers:
            try: