diff --git a/erp5/util/testnode/ScalabilityTestRunner.py b/erp5/util/testnode/ScalabilityTestRunner.py index 1cae006b457f44ef53088a044fd4b23b9cdb1398..29d0b89fd1dbbd6e0625aaca540a89a3a6fb89ae 100644 --- a/erp5/util/testnode/ScalabilityTestRunner.py +++ b/erp5/util/testnode/ScalabilityTestRunner.py @@ -423,16 +423,6 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),)) self._waitInstance(self.instance_title, SlapOSMasterCommunicator.INSTANCE_STATE_STARTED) self.slapos_communicator._request(SlapOSMasterCommunicator.INSTANCE_STATE_STARTED) - ''' - # ROQUE: for now, this old hack is not needed - # XXX: Dirty hack used to force haproxy to restart in time with all zope informations. - self._waitInstance(self.instance_title, SlapOSMasterCommunicator.INSTANCE_STATE_STARTED) - self.slapos_communicator._request(SlapOSMasterCommunicator.INSTANCE_STATE_STOPPED) - self._waitInstance(self.instance_title, SlapOSMasterCommunicator.INSTANCE_STATE_STOPPED) - self.slapos_communicator._request(SlapOSMasterCommunicator.INSTANCE_STATE_STARTED) - ########################################################## - ''' - self._waitInstance(self.instance_title, SlapOSMasterCommunicator.INSTANCE_STATE_STARTED) self.log("[DEBUG] INSTANCE CORRECTLY STARTED") diff --git a/erp5/util/testnode/testnode.py b/erp5/util/testnode/testnode.py index 4ff8d855efa1c9ee4ea688bc848afc56e0c46e58..46cfee00bfd44b3a6f33c2d5385db17ed095690d 100644 --- a/erp5/util/testnode/testnode.py +++ b/erp5/util/testnode/testnode.py @@ -406,8 +406,8 @@ shared = true # know slapos parameters to user for creating instances log("Getting configuration from test suite " + str(node_test_suite.test_suite_title)) generated_config = self.test_suite_portal.generateConfiguration(node_test_suite.test_suite_title) - jsonData = json.loads(generated_config) - cluster_configuration = Utils.deunicodeData(jsonData['configuration_list'][0]) + json_data = json.loads(generated_config) + cluster_configuration = Utils.deunicodeData(json_data['configuration_list'][0]) node_test_suite.edit(cluster_configuration=cluster_configuration) # Now prepare the installation of SlapOS and create instance status_dict = runner.prepareSlapOSForTestSuite(node_test_suite)