Commit 9a1accb1 authored by Benjamin Blanc's avatar Benjamin Blanc

testnode: ScalabilityTestRunner: Do not put error message when test is correctly finished

parent 5e9050d6
...@@ -428,8 +428,12 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),)) ...@@ -428,8 +428,12 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
test_result_proxy.reportFailure(stdout=error_message) test_result_proxy.reportFailure(stdout=error_message)
break break
# Test cancelled or in an undeterminate state. # Test cancelled, finished or in an undeterminate state.
if not test_result_proxy.isAlive(): if not test_result_proxy.isAlive():
# Test finished
if count == len(configuration_list):
break
# Cancelled or in an undeterminate state.
error_message = "Test cancelled or undeterminate state." error_message = "Test cancelled or undeterminate state."
error = ValueError(error_message) error = ValueError(error_message)
break break
...@@ -445,8 +449,8 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),)) ...@@ -445,8 +449,8 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
if error: if error:
test_result_proxy.fail() test_result_proxy.fail()
raise error raise error
#else: # Test is finished.
#test_result_proxy.stop() self.log("Test finished.")
return {'status_code' : 0} return {'status_code' : 0}
def _cleanUpOldInstance(self): def _cleanUpOldInstance(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment