Commit a3c074d7 authored by Benjamin Blanc's avatar Benjamin Blanc

testnode: ScalabilityTestRunne: Fix typo

parent 5461b283
...@@ -209,20 +209,20 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),)) ...@@ -209,20 +209,20 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
and (max_time > (time.time()-start_time))): and (max_time > (time.time()-start_time))):
time.sleep(15) time.sleep(15)
if (time.time()-start_time) > max_time: if (time.time()-start_time) > max_time:
raise ValueError("Instance '%s' not '%s' after %s seconds" %(title, state)) raise ValueError("Instance '%s' not '%s' after %s seconds" %(instance_title, state))
self.log("Instance correctly '%s' after %s seconds." %(state, str(time.time()-start_time))) self.log("Instance correctly '%s' after %s seconds." %(state, str(time.time()-start_time)))
def _waitInstanceCreation(self, title, max_time=MAX_CREATION_INSTANCE_TIME): def _waitInstanceCreation(self, instance_title, max_time=MAX_CREATION_INSTANCE_TIME):
""" """
Wait for 'max_time' the instance creation Wait for 'max_time' the instance creation
""" """
self.log("Wait for instance creation") self.log("Wait for instance creation")
start_time = time.time() start_time = time.time()
while ( not self.slapos_communicator.isRegisteredHostingSubscription(title) \ while ( not self.slapos_communicator.isRegisteredHostingSubscription(instance_title) \
and (max_time > (time.time()-start_time)) ): and (max_time > (time.time()-start_time)) ):
time.sleep(5) time.sleep(5)
if (time.time()-start_time) > max_time: if (time.time()-start_time) > max_time:
raise ValueError("Instance '%s' not found after %s seconds" %(title, max_time)) raise ValueError("Instance '%s' not found after %s seconds" %(instance_title, max_time))
self.log("Instance found on slapOSMaster") self.log("Instance found on slapOSMaster")
def prepareSlapOSForTestSuite(self, node_test_suite): def prepareSlapOSForTestSuite(self, node_test_suite):
......
...@@ -383,7 +383,11 @@ from the distributor.") ...@@ -383,7 +383,11 @@ from the distributor.")
# as partitions can be of any kind we have and likely will never have # as partitions can be of any kind we have and likely will never have
# a reliable way to check if they are up or not ... # a reliable way to check if they are up or not ...
#time.sleep(20) #time.sleep(20)
runner.runTestSuite(node_test_suite, portal_url) if status_dict['status_code'] == 0:
runner.runTestSuite(node_test_suite, portal_url)
else:
#TODO: do a fail on test result
pass
# break the loop to get latest priorities from master # break the loop to get latest priorities from master
break break
self.cleanUp(test_result) self.cleanUp(test_result)
......
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