Merge branch 'erp5testnode'

slapos/recipe/erp5testnode/__init__.py

@@ -87,8 +87,9 @@ class Recipe(BaseSlapRecipe):
               node_quantity=self.parameter_dict.get('node_quantity', '1'),
               test_suite_master_url=self.parameter_dict.get(
                                 'test_suite_master_url', None),
-              test_suite_name=self.parameter_dict.get('test_suite_name'),
+              test_suite=self.parameter_dict.get('test_suite'),
               test_suite_title=self.parameter_dict.get('test_suite_title'),
+              test_node_title=self.parameter_dict.get('test_node_title'),
               project_title=self.parameter_dict.get('project_title'),
               bin_directory=self.bin_directory,
               # botenvironemnt is splittable string of key=value to substitute

slapos/recipe/erp5testnode/testnode.py

@@ -101,6 +101,7 @@ branch = %(branch)s
   custom_profile.close()
   config['repository_path'] = repository_path
   sys.path.append(repository_path)
+  test_suite_title = config['test_suite_title'] or config['test_suite']
 
   retry_software = False
   try:
@@ -151,8 +152,9 @@ branch = %(branch)s
           master = portal.portal_task_distribution
           assert master.getProtocolRevision() == 1
           test_result = safeRpcCall(master.createTestResult,
-            config['test_suite_name'], revision, [],
-            False, config['test_suite_title'], config['project_title'])
+            config['test_suite'], revision, [],
+            False, test_suite_title,
+            config['test_node_title'], config['project_title'])
         print "testnode, test_result : %r" % (test_result,)
         if test_result:
           test_result_path, test_revision = test_result
@@ -176,7 +178,7 @@ branch = %(branch)s
             )
           if status_dict['status_code'] != 0:
             safeRpcCall(master.reportTaskFailure,
-              test_result_path, status_dict, config['test_suite_title'])
+              test_result_path, status_dict, config['test_node_title'])
             retry_software = True
             continue
 
@@ -220,7 +222,7 @@ branch = %(branch)s
           if line[:2] == '#!':
             invocation_list = line[2:].split()
           invocation_list.extend([run_test_suite_path,
-                                  '--test_suite', config['test_suite_name'],
+                                  '--test_suite', config['test_suite'],
                                   '--revision', revision,
                                   '--node_quantity', config['node_quantity'],
                                   '--master_url', config['test_suite_master_url']])