Up

erp5/util/testnode/ScalabilityTestRunner.py

@@ -70,9 +70,9 @@ class ScalabilityTestRunner():
     """
     A proxy to supply : Install a software on a specific node
     """
-    self.testnode.log("TESTNODE SUPPLY : %s %s", software_path, computer_guid)
+    self.testnode.log("testnode, supply : %s %s", software_path, computer_guid)
     if self.authorize_supply :
-      if not(computer_guid in self.remaining_software_installation_grid):
+      if not computer_guid in self.remaining_software_installation_grid:
         # Add computer_guid to the grid if it isn't
         self.remaining_software_installation_grid[computer_guid] = []
       self.remaining_software_installation_grid[computer_guid].append(software_path)
@@ -96,9 +96,7 @@ class ScalabilityTestRunner():
   def isSoftwareReleaseReady(self, software_url, computer_guid):
     # TODO : implement this method
     # -> communication with SlapOS master
-      
     # todo : simulate slapOS Master answer
-      
     return False
       
   def remainSoftwareToInstall(self):
@@ -106,6 +104,9 @@ class ScalabilityTestRunner():
     Return True if all softwares are installed, otherwise return False
     """
     # 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:
       for software_url in v:
         if isSoftwareReleaseReady(software_url, computer_guid):
@@ -127,9 +128,10 @@ class ScalabilityTestRunner():
             self.testnode.config['test_node_title']):
       # Get from ERP5 Master the configuration of the cluster for the test
       test_configuration = testnodeUtils.deunicodeData(
-                               json.loads(
-                                  self.testnode.test_suite_portal.generateConfiguration(
-                                    node_test_suite.test_suite_title)))
+          json.loads(self.testnode.test_suite_portal.generateConfiguration(
+                      node_test_suite.test_suite_title)
+                    )
+        )
       self.involved_nodes_computer_guid = test_configuration['involved_nodes_computer_guid']
       self.launchable = test_configuration['launchable']
       self.error_message = test_configuration['error_message']