Reuse SubprocessError exception in more error cases.

Prepares for task cleanup on failure.

slapos/recipe/erp5testnode/SlapOSControler.py

@@ -57,9 +57,10 @@ class SlapOSControler(object):
     cpu_count = os.sysconf("SC_NPROCESSORS_ONLN")
     os.putenv('MAKEFLAGS', '-j%s' % cpu_count)
     os.environ['PATH'] = environment['PATH']
-    slapgrid = subprocess.Popen([config['slapgrid_software_binary'], '-v', '-c',
+    command = [config['slapgrid_software_binary'], '-v', '-c',
       #'--buildout-parameter',"'-U -N' -o",
-      config['slapos_config']],
+      config['slapos_config']]
+    slapgrid = subprocess.Popen(command,
       stdout=stdout, stderr=stderr,
       close_fds=True, preexec_fn=os.setsid)
     process_group_pid_set.add(slapgrid.pid)
@@ -68,6 +69,7 @@ class SlapOSControler(object):
     stderr.seek(0)
     process_group_pid_set.remove(slapgrid.pid)
     status_dict = {'status_code':slapgrid.returncode,
+                    'command': repr(command),
                     'stdout':stdout.read(),
                     'stderr':stderr.read()}
     stdout.close()
@@ -82,8 +84,9 @@ class SlapOSControler(object):
     slap.registerOpenOrder().request(self.software_profile,
         partition_reference='testing partition',
         partition_parameter_kw=config['instance_dict'])
-    slapgrid = subprocess.Popen([config['slapgrid_partition_binary'],
-      config['slapos_config'], '-c', '-v'],
+    command = [config['slapgrid_partition_binary'],
+      config['slapos_config'], '-c', '-v']
+    slapgrid = subprocess.Popen(command,
       stdout=stdout, stderr=stderr,
       close_fds=True, preexec_fn=os.setsid)
     process_group_pid_set.add(slapgrid.pid)
@@ -92,6 +95,7 @@ class SlapOSControler(object):
     stderr.seek(0)
     process_group_pid_set.remove(slapgrid.pid)
     status_dict = {'status_code':slapgrid.returncode,
+                    'command': repr(command),
                     'stdout':stdout.read(),
                     'stderr':stderr.read()}
     stdout.close()

slapos/recipe/erp5testnode/testnode.py

@@ -227,19 +227,22 @@ branch = %(branch)s
               stdout=stdout, stderr=stderr
               )
             if status_dict['status_code'] != 0:
-              break
-          if status_dict['status_code'] != 0:
-            safeRpcCall(master.reportTaskFailure,
-              test_result_path, status_dict, config['test_node_title'])
-            retry_software = True
-            continue
+              safeRpcCall(master.reportTaskFailure,
+                test_result_path, status_dict, config['test_node_title'])
+              retry_software = True
+              raise SubprocessError(status_dict)
 
           partition_path = os.path.join(config['instance_root'],
                                         config['partition_reference'])
           run_test_suite_path = os.path.join(partition_path, 'bin',
                                             'runTestSuite')
           if not os.path.exists(run_test_suite_path):
-            raise ValueError('No %r provided' % run_test_suite_path)
+            raise SubprocessError({
+              'command': 'os.path.exists(run_test_suite_path)',
+              'status_code': 1,
+              'stdout': '',
+              'stderr': 'File does not exist: %r' % (run_test_suite_path, ),
+            })
 
           run_test_suite_revision = revision
           if isinstance(revision, tuple):