testnode: revert e000acdd and fix

Fix undeclared variable when test_suite parameter is missing.

erp5/util/testnode/ScalabilityTestRunner.py

@@ -338,7 +338,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
       self.instance_title = self._generateInstanceTitle(node_test_suite.test_suite_title)
       try:
         self._createInstance(self.reachable_profile, configuration_list[0],
-                              self.instance_title, node_test_suite.test_result, node_test_suite.test_suite_title)
+                              self.instance_title, node_test_suite.test_result, node_test_suite.test_suite)
         self.log("Scalability instance requested.")
       except:
         self.log("Unable to launch instance")
@@ -369,7 +369,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
         self._waitInstance(self.instance_title, 'stopped')
         # Update instance XML configuration 
         self._updateInstanceXML(configuration, self.instance_title,
-                      node_test_suite.test_result, node_test_suite.test_suite_title)
+                      node_test_suite.test_result, node_test_suite.test_suite)
         self._waitInstance(self.instance_title, 'started')
         # Start instance
         self.slapos_controler.startInstance(self.instance_title)

erp5/util/testnode/testnode.py

@@ -360,6 +360,9 @@ from the distributor.")
                working_directory=self.config['working_directory'],
                log_directory=self.config['log_directory'])
             node_test_suite.edit(**test_suite)
+            # XXX: temporary hack to prevent empty test_suite
+            if not node_test_suite.get('test_suite'):
+              node_test_suite.edit(test_suite='')
             run_software = True
             # kill processes from previous loop if any
             self.process_manager.killPreviousRun()