Commit c46285ec authored by Benjamin Blanc's avatar Benjamin Blanc

Software installation works fine here.

parent 3e70794b
...@@ -104,23 +104,12 @@ class ScalabilityTestRunner(): ...@@ -104,23 +104,12 @@ class ScalabilityTestRunner():
Return True if all softwares are not installed, otherwise return False Return True if all softwares are not installed, otherwise return False
""" """
# Remove from grid installed software entries # Remove from grid installed software entries
print "self.remaining_software_installation_grid:"
print self.remaining_software_installation_grid
for computer_guid,v in self.remaining_software_installation_grid.items(): for computer_guid,v in self.remaining_software_installation_grid.items():
for software_url in v: for software_url in v:
if self.isSoftwareReleaseReady(software_url, computer_guid): if self.isSoftwareReleaseReady(software_url, computer_guid):
self.remaining_software_installation_grid[computer_guid].remove(software_url) self.remaining_software_installation_grid[computer_guid].remove(software_url)
if len(self.remaining_software_installation_grid[computer_guid])==0: if len(self.remaining_software_installation_grid[computer_guid])==0:
del self.remaining_software_installation_grid[computer_guid] del self.remaining_software_installation_grid[computer_guid]
# Remove from grid installed software entries
print "AFTER self.remaining_software_installation_grid:"
print self.remaining_software_installation_grid
print "len(self.remaining_software_installation_grid) > 0:"
print len(self.remaining_software_installation_grid) > 0
# Not empty grid means that all softwares are not installed # Not empty grid means that all softwares are not installed
return len(self.remaining_software_installation_grid) > 0 return len(self.remaining_software_installation_grid) > 0
...@@ -164,11 +153,8 @@ class ScalabilityTestRunner(): ...@@ -164,11 +153,8 @@ class ScalabilityTestRunner():
# From the line below we would not supply any more softwares # From the line below we would not supply any more softwares
self.authorize_supply = False self.authorize_supply = False
# Waiting until all softwares are installed # Waiting until all softwares are installed
print "waiting vlaue:"
print max_time <= time.time()-start_time
while ( self.remainSoftwareToInstall() while ( self.remainSoftwareToInstall()
and (max_time >= (time.time()-start_time))): and (max_time > (time.time()-start_time))):
self.testnode.log("Master testnode is waiting\ self.testnode.log("Master testnode is waiting\
for the end of all software installation.") for the end of all software installation.")
time.sleep(15) time.sleep(15)
......
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