mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-05-31 15:10:41 +02:00
some tests dont run
This commit is contained in:
parent
bccdc32d4b
commit
5df8dfe68d
@ -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:
|
||||
|
Loading…
x
Reference in New Issue
Block a user