From 3e45db2300a492e72553d540b4f2d7f99fb7450d Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Fri, 11 Apr 2025 16:37:52 +0200
Subject: [PATCH] fix for catching generaltests exceptions and exiting instead
 of continuing

---
 tests/scripts/test_simulators.py | 70 ++++++++++++++++----------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/tests/scripts/test_simulators.py b/tests/scripts/test_simulators.py
index d2ecf66d0..7128a42a8 100644
--- a/tests/scripts/test_simulators.py
+++ b/tests/scripts/test_simulators.py
@@ -199,6 +199,40 @@ with open(fname, 'w') as fp:
 
     try:
         startGeneralTests(fp, file_results)
+        killAllStaleProcesses(fp)
+
+        for server in servers:
+            try:
+                # print to terminal for progress
+                sys.stdout = original_stdout
+                sys.stderr = original_stderr
+                file_results = prefix_fname + '_results_cmd_' + server + '.txt'
+                Log(Fore.BLUE, 'Cmd tests for ' + server + ' (results: ' + file_results + ')')
+                sys.stdout = fp
+                sys.stderr = fp
+                Log(Fore.BLUE, 'Cmd tests for ' + server + ' (results: ' + file_results + ')')
+                
+                # cmd tests for det
+                cleanup(server, fp)
+                startServer(server)
+                startReceiver(server)
+                loadConfig(server, args.rx_hostname, args.settingspath)
+                startCmdTests(server, fp, file_results)
+                cleanup(server, fp)
+                
+                # redirect to terminal
+                sys.stdout = original_stdout
+                sys.stderr = original_stderr
+                Log(Fore.GREEN, 'Passed all tests for virtual detectors \n' + str(servers))
+        
+            except Exception as e:
+                # redirect to terminal
+                sys.stdout = original_stdout
+                sys.stderr = original_stderr
+                Log(Fore.RED, f'Exception caught while testing {server}. Cleaning up...')
+
+                break
+
     except Exception as e:
         # redirect to terminal
         sys.stdout = original_stdout
@@ -206,39 +240,5 @@ with open(fname, 'w') as fp:
         Log(Fore.RED, f'Exception caught with general testing. Cleaning up...')
         Log(Fore.RED, str(e))
         cleanSharedmemory(sys.stdout)
-    
-    killAllStaleProcesses(fp)
-
-    for server in servers:
-        try:
-            # print to terminal for progress
-            sys.stdout = original_stdout
-            sys.stderr = original_stderr
-            file_results = prefix_fname + '_results_cmd_' + server + '.txt'
-            Log(Fore.BLUE, 'Cmd tests for ' + server + ' (results: ' + file_results + ')')
-            sys.stdout = fp
-            sys.stderr = fp
-            Log(Fore.BLUE, 'Cmd tests for ' + server + ' (results: ' + file_results + ')')
-            
-            # cmd tests for det
-            cleanup(server, fp)
-            startServer(server)
-            startReceiver(server)
-            loadConfig(server, args.rx_hostname, args.settingspath)
-            startCmdTests(server, fp, file_results)
-            cleanup(server, fp)
-            
-            # redirect to terminal
-            sys.stdout = original_stdout
-            sys.stderr = original_stderr
-            Log(Fore.GREEN, 'Passed all tests for virtual detectors \n' + str(servers))
-    
-        except Exception as e:
-            # redirect to terminal
-            sys.stdout = original_stdout
-            sys.stderr = original_stderr
-            Log(Fore.RED, f'Exception caught while testing {server}. Cleaning up...')
-
-            break
-
+