mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-20 02:40:03 +02:00
fix for catching generaltests exceptions and exiting instead of continuing
This commit is contained in:
parent
c33a8b9742
commit
3e45db2300
@ -199,6 +199,40 @@ with open(fname, 'w') as fp:
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
startGeneralTests(fp, file_results)
|
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:
|
except Exception as e:
|
||||||
# redirect to terminal
|
# redirect to terminal
|
||||||
sys.stdout = original_stdout
|
sys.stdout = original_stdout
|
||||||
@ -207,38 +241,4 @@ with open(fname, 'w') as fp:
|
|||||||
Log(Fore.RED, str(e))
|
Log(Fore.RED, str(e))
|
||||||
cleanSharedmemory(sys.stdout)
|
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
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user