Commit 256d3498 authored by Benjamin Blanc's avatar Benjamin Blanc

Up

parent 0b962d20
...@@ -855,6 +855,8 @@ branch = foo ...@@ -855,6 +855,8 @@ branch = foo
pass pass
def test_zzzz_scalability_19_xxxx(self): def test_zzzz_scalability_19_xxxx(self):
# TODO : fill the dummy slapos answer
# by patching isSoftwareReleaseReady method.
def patch_createTestResult(self, revision, test_name_list, node_title, def patch_createTestResult(self, revision, test_name_list, node_title,
allow_restart=False, test_title=None, project_title=None): allow_restart=False, test_title=None, project_title=None):
test_result_path = os.path.join(test_result_path_root, test_title) test_result_path = os.path.join(test_result_path_root, test_title)
......
...@@ -98,11 +98,11 @@ class ScalabilityTestRunner(): ...@@ -98,11 +98,11 @@ class ScalabilityTestRunner():
self.log("Dummy SlapOS Master answer received.") self.log("Dummy SlapOS Master answer received.")
self.last_slapos_answer.append(True) self.last_slapos_answer.append(True)
def _prepareDummySlapOSAnswer(self): def _prepareDummySlapOSAnswer(self):
print "Dummy slapOS answer enabled, send signal to %s (kill -10 %s) to simu\ self.log("Dummy slapOS answer enabled, send signal to %s (kill -10 %s) to simu\
late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),) late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
signal.signal(signal.SIGUSR1, self._getSignal) signal.signal(signal.SIGUSR1, self._getSignal)
def _comeBackFromDummySlapOS(self): def _comeBackFromDummySlapOS(self):
print "Dummy slapOS answer disabled, please don't send more signals." self.log("Dummy slapOS answer disabled, please don't send more signals.")
# use SIG_USR (kill) # use SIG_USR (kill)
signal.signal(signal.SIGUSR1, signal.SIG_DFL) signal.signal(signal.SIGUSR1, signal.SIG_DFL)
def simulateSlapOSAnswer(self): def simulateSlapOSAnswer(self):
...@@ -138,7 +138,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),) ...@@ -138,7 +138,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),)
""" """
# Define how many time this method can take # Define how many time this method can take
max_time = 3600*10*1.0 # 10 hours max_time = 3600*10*1.0 # 10 hours
interval_time = 30 interval_time = 60
start_time = time.time() start_time = time.time()
# Only master testnode must order software installation # Only master testnode must order software installation
if self.testnode.test_suite_portal.isMasterTestnode( if self.testnode.test_suite_portal.isMasterTestnode(
...@@ -208,8 +208,8 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),) ...@@ -208,8 +208,8 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),)
while ( self.remainSoftwareToInstall() while ( self.remainSoftwareToInstall()
and (max_time > (time.time()-start_time))): and (max_time > (time.time()-start_time))):
self.log("Master testnode is waiting\ self.log("Master testnode is waiting\
for the end of all software installation (for %ss).", for the end of all software installation (for %ss) PID=%s.",
str(int(time.time()-start_time))) str(int(time.time()-start_time)), str(os.getpid()))
time.sleep(interval_time) time.sleep(interval_time)
# We were wainting for too long time, that's a failure. # We were wainting for too long time, that's a failure.
# TODO : remove the line below wich simulate an answer from slapos master # TODO : remove the line below wich simulate an answer from slapos master
......
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