Rename 'link_to_testsuite' directory to 'software' directory

erp5/tests/testERP5TestNode.py

@@ -27,7 +27,7 @@ class ERP5TestNode(TestCase):
     self._temp_dir = tempfile.mkdtemp()
     self.working_directory = os.path.join(self._temp_dir, 'testnode')
     self.slapos_directory = os.path.join(self._temp_dir, 'slapos')
-    self.link_to_testsuite_directory = os.path.join(self._temp_dir, 'link_to_testsuite_directory')
+    self.software_directory = os.path.join(self._temp_dir, 'software_directory')
     self.test_suite_directory = os.path.join(self._temp_dir,'test_suite')
     self.environment = os.path.join(self._temp_dir,'environment')
     self.log_directory = os.path.join(self._temp_dir,'var/log/testnode')
@@ -39,7 +39,7 @@ class ERP5TestNode(TestCase):
     os.mkdir(self.working_directory)
     os.mkdir(self.slapos_directory)
     os.mkdir(self.test_suite_directory)
-    os.mkdir(self.link_to_testsuite_directory)
+    os.mkdir(self.software_directory)
     os.mkdir(self.environment)
     os.mkdir(self.system_temp_folder)
     os.makedirs(self.log_directory)

erp5/util/testnode/ScalabilityTestRunner.py

@@ -59,7 +59,9 @@ class ScalabilityTestRunner():
     self.slapos_controler.createSlaposConfigurationFileAccount(key,certificate,
                                     self.testnode.config)
                               
+
     self.remaining_software_installation_grid = {}
+    
     # Protection to prevent installation of softwares after checking
     self.authorize_supply = True
     # Used to simulate SlapOS answer (used as a queue)
@@ -165,8 +167,8 @@ class ScalabilityTestRunner():
         return {'status_code' : 1}
 
       # create an obfuscated link to the testsuite directory
-      self.testnode.log("self.testnode.config['link_to_testsuite_directory']\
- : %s" %(self.testnode.config['link_to_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))
       path_to_suite = os.path.join(
@@ -175,7 +177,7 @@ class ScalabilityTestRunner():
       self.testnode.log("path_to_suite\
  : %s" %(path_to_suite))
       self.ofuscated_link_path = os.path.join(
-                      self.testnode.config['link_to_testsuite_directory'],
+                      self.testnode.config['software_directory'],
                       self.random_path)
       if ( not os.path.lexists(self.ofuscated_link_path) and
            os.path.exists(self.ofuscated_link_path) ) :

erp5/util/testnode/__init__.py

@@ -75,7 +75,7 @@ def main(*args):
   config.readfp(parsed_argument.configuration_file[0])
   for key in ('slapos_directory','working_directory','test_suite_directory',
               'log_directory','run_directory', 'srv_directory', 'proxy_host',
-              'link_to_testsuite_directory',
+              'software_directory',
               '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',
@@ -84,7 +84,7 @@ def main(*args):
     CONFIG[key] = config.get('testnode',key)
 
   for key in ('slapos_directory', 'working_directory', 'test_suite_directory',
-      'log_directory', 'run_directory', 'srv_directory', 'link_to_testsuite_directory'):
+      'log_directory', 'run_directory', 'srv_directory', 'software_directory'):
     d = CONFIG[key]
     if not os.path.isdir(d):
       raise ValueError('Directory %r does not exists.' % d)