Commit 8a18779d authored by Benjamin Blanc's avatar Benjamin Blanc

Rename random_path to randomized_path

parent ac32c205
...@@ -477,7 +477,7 @@ branch = foo ...@@ -477,7 +477,7 @@ branch = foo
def patch_generateConfiguration(self, *args, **kw): def patch_generateConfiguration(self, *args, **kw):
return '{"configuration_list": [], "involved_nodes_computer_guid"\ return '{"configuration_list": [], "involved_nodes_computer_guid"\
: [], "error_message": "No error.", "launcher_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): def patch_isMasterTestnode(self, *args, **kw):
return (grade == 'master') return (grade == 'master')
test_self = self test_self = self
...@@ -634,7 +634,7 @@ branch = foo ...@@ -634,7 +634,7 @@ branch = foo
def patch_generateConfiguration(self, *args, **kw): def patch_generateConfiguration(self, *args, **kw):
return '{"configuration_list": [], "involved_nodes_computer_guid"\ return '{"configuration_list": [], "involved_nodes_computer_guid"\
: [], "error_message": "No error.", "launcher_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): def patch_isMasterTestnode(self, *args, **kw):
return (grade == 'master') return (grade == 'master')
test_self = self test_self = self
......
...@@ -156,7 +156,7 @@ class ScalabilityTestRunner(): ...@@ -156,7 +156,7 @@ class ScalabilityTestRunner():
self.involved_nodes_computer_guid = test_configuration['involved_nodes_computer_guid'] self.involved_nodes_computer_guid = test_configuration['involved_nodes_computer_guid']
self.launchable = test_configuration['launchable'] self.launchable = test_configuration['launchable']
self.error_message = test_configuration['error_message'] 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 # Avoid the test if it is not launchable
if not self.launchable: if not self.launchable:
...@@ -169,8 +169,8 @@ class ScalabilityTestRunner(): ...@@ -169,8 +169,8 @@ class ScalabilityTestRunner():
# create an obfuscated link to the testsuite directory # create an obfuscated link to the testsuite directory
self.testnode.log("self.testnode.config['software_directory']\ self.testnode.log("self.testnode.config['software_directory']\
: %s" %(self.testnode.config['software_directory'])) : %s" %(self.testnode.config['software_directory']))
self.testnode.log("self.random_path\ self.testnode.log("self.randomized_path\
: %s" %(self.random_path)) : %s" %(self.randomized_path))
path_to_suite = os.path.join( path_to_suite = os.path.join(
self.testnode.config['working_directory'], self.testnode.config['working_directory'],
node_test_suite.reference) node_test_suite.reference)
...@@ -178,7 +178,7 @@ class ScalabilityTestRunner(): ...@@ -178,7 +178,7 @@ class ScalabilityTestRunner():
: %s" %(path_to_suite)) : %s" %(path_to_suite))
self.ofuscated_link_path = os.path.join( self.ofuscated_link_path = os.path.join(
self.testnode.config['software_directory'], self.testnode.config['software_directory'],
self.random_path) self.randomized_path)
if ( not os.path.lexists(self.ofuscated_link_path) and if ( not os.path.lexists(self.ofuscated_link_path) and
os.path.exists(self.ofuscated_link_path) ) : os.path.exists(self.ofuscated_link_path) ) :
try : try :
...@@ -196,7 +196,7 @@ class ScalabilityTestRunner(): ...@@ -196,7 +196,7 @@ class ScalabilityTestRunner():
# Construct the ipv6 obfuscated url of the software profile reachable from outside # Construct the ipv6 obfuscated url of the software profile reachable from outside
self.reachable_profile = os.path.join( self.reachable_profile = os.path.join(
"https://","["+self.testnode.config['httpd_ip']+"]"+":"+self.testnode.config['httpd_software_access_port'], "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.testnode.log("Software reachable profile path is : %s "
%(self.reachable_profile,)) %(self.reachable_profile,))
software_path_list.append(self.reachable_profile) software_path_list.append(self.reachable_profile)
......
...@@ -79,8 +79,8 @@ def main(*args): ...@@ -79,8 +79,8 @@ def main(*args):
'proxy_port', 'git_binary','zip_binary','node_quantity', 'proxy_port', 'git_binary','zip_binary','node_quantity',
'test_node_title', 'ipv4_address','ipv6_address','test_suite_master_url', 'test_node_title', 'ipv4_address','ipv6_address','test_suite_master_url',
'slapgrid_partition_binary','slapgrid_software_binary', 'slapgrid_partition_binary','slapgrid_software_binary',
'slapproxy_binary', 'httpd_ip', 'httpd_port', 'httpd_software_access_port', 'computer_id', 'slapproxy_binary', 'httpd_ip', 'httpd_port', 'httpd_software_access_port',
'server_url'): 'computer_id', 'server_url'):
CONFIG[key] = config.get('testnode',key) CONFIG[key] = config.get('testnode',key)
for key in ('slapos_directory', 'working_directory', 'test_suite_directory', for key in ('slapos_directory', 'working_directory', 'test_suite_directory',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment