testnode: code cleanup

Variable name changed from jsonData to json_data. Old comment deleted.

testnode: code cleanup
Variable name changed from jsonData to json_data. Old comment deleted.
47816025 · Roque · Sebastien Robin · 328b0533 · 47816025 · 47816025
Commit 47816025 authored Sep 28, 2017 by Roque Committed by Sebastien Robin Oct 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 12 deletions

erp5/util/testnode/ScalabilityTestRunner.py erp5/util/testnode/ScalabilityTestRunner.py +0 -10

erp5/util/testnode/testnode.py erp5/util/testnode/testnode.py +2 -2

No files found.
--- 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")
      

--- 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)