diff --git a/erp5/tests/testERP5TestNode.py b/erp5/tests/testERP5TestNode.py index 9112f006e3b6f6c9223684a9782b2e36379cbb7e..d0a38b540cadd70a67fa6a0077fb31c2fde2fa04 100644 --- a/erp5/tests/testERP5TestNode.py +++ b/erp5/tests/testERP5TestNode.py @@ -477,7 +477,7 @@ branch = foo def patch_generateConfiguration(self, *args, **kw): return '{"configuration_list": [], "involved_nodes_computer_guid"\ : [], "error_message": "No error.", "launcher_nodes_computer_guid": {}, \ -"launchable": false, "random_path" : "azertyuiop"}' +"launchable": false, "randomized_path" : "azertyuiop"}' def patch_isMasterTestnode(self, *args, **kw): return (grade == 'master') test_self = self @@ -634,7 +634,7 @@ branch = foo def patch_generateConfiguration(self, *args, **kw): return '{"configuration_list": [], "involved_nodes_computer_guid"\ : [], "error_message": "No error.", "launcher_nodes_computer_guid": {}, \ -"launchable": false, "random_path" : "azertyuiop"}' +"launchable": false, "randomized_path" : "azertyuiop"}' def patch_isMasterTestnode(self, *args, **kw): return (grade == 'master') test_self = self diff --git a/erp5/util/testnode/ScalabilityTestRunner.py b/erp5/util/testnode/ScalabilityTestRunner.py index 2d73d46d35a6919870c1c0ca6f2c82b37e9e51c2..e1cfec29d3165b92ab026a545731c283beebdf9f 100644 --- a/erp5/util/testnode/ScalabilityTestRunner.py +++ b/erp5/util/testnode/ScalabilityTestRunner.py @@ -156,7 +156,7 @@ class ScalabilityTestRunner(): self.involved_nodes_computer_guid = test_configuration['involved_nodes_computer_guid'] self.launchable = test_configuration['launchable'] self.error_message = test_configuration['error_message'] - self.random_path = test_configuration['random_path'] + self.randomized_path = test_configuration['randomized_path'] # Avoid the test if it is not launchable if not self.launchable: @@ -169,8 +169,8 @@ class ScalabilityTestRunner(): # create an obfuscated link to the testsuite directory self.testnode.log("self.testnode.config['software_directory']\ : %s" %(self.testnode.config['software_directory'])) - self.testnode.log("self.random_path\ - : %s" %(self.random_path)) + self.testnode.log("self.randomized_path\ + : %s" %(self.randomized_path)) path_to_suite = os.path.join( self.testnode.config['working_directory'], node_test_suite.reference) @@ -178,7 +178,7 @@ class ScalabilityTestRunner(): : %s" %(path_to_suite)) self.ofuscated_link_path = os.path.join( self.testnode.config['software_directory'], - self.random_path) + self.randomized_path) if ( not os.path.lexists(self.ofuscated_link_path) and os.path.exists(self.ofuscated_link_path) ) : try : @@ -196,7 +196,7 @@ class ScalabilityTestRunner(): # Construct the ipv6 obfuscated url of the software profile reachable from outside self.reachable_profile = os.path.join( "https://","["+self.testnode.config['httpd_ip']+"]"+":"+self.testnode.config['httpd_software_access_port'], - self.random_path, "software.cfg") + self.randomized_path, "software.cfg") self.testnode.log("Software reachable profile path is : %s " %(self.reachable_profile,)) software_path_list.append(self.reachable_profile) diff --git a/erp5/util/testnode/__init__.py b/erp5/util/testnode/__init__.py index 33e00a2a40793152955c1eff59d783e6fd903ec0..c6060d1e3350e1fa5eaa68a863a2cd112b9dc0e7 100644 --- a/erp5/util/testnode/__init__.py +++ b/erp5/util/testnode/__init__.py @@ -79,8 +79,8 @@ def main(*args): 'proxy_port', 'git_binary','zip_binary','node_quantity', 'test_node_title', 'ipv4_address','ipv6_address','test_suite_master_url', 'slapgrid_partition_binary','slapgrid_software_binary', - 'slapproxy_binary', 'httpd_ip', 'httpd_port', 'httpd_software_access_port', 'computer_id', - 'server_url'): + 'slapproxy_binary', 'httpd_ip', 'httpd_port', 'httpd_software_access_port', + 'computer_id', 'server_url'): CONFIG[key] = config.get('testnode',key) for key in ('slapos_directory', 'working_directory', 'test_suite_directory',