X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vapi.py;h=50a34df01fe525e4763b37a43d28af580ca47363;hb=f91080c01104a5999fe6c08e699b3426fea62dad;hp=5f972323c61d3187b0eb793f3026249647476ce6;hpb=d3e671e0dbb879d90f00bdee608ee0bb5f6357ae;p=vpp.git

diff --git a/test/test_vapi.py b/test/test_vapi.py
index 5f972323c61..50a34df01fe 100644
--- a/test/test_vapi.py
+++ b/test/test_vapi.py
@@ -1,45 +1,11 @@
 #!/usr/bin/env python
 """ VAPI test """
 
-from __future__ import division
 import unittest
 import os
 import signal
-import subprocess
-from threading import Thread
-from log import single_line_delim
 from framework import VppTestCase, running_extended_tests, \
-    running_on_centos, VppTestRunner
-
-
-class Worker(Thread):
-    def __init__(self, args, logger):
-        self.logger = logger
-        self.args = args
-        self.result = None
-        super(Worker, self).__init__()
-
-    def run(self):
-        executable = self.args[0]
-        self.logger.debug("Running executable w/args `%s'" % self.args)
-        env = os.environ.copy()
-        env["CK_LOG_FILE_NAME"] = "-"
-        self.process = subprocess.Popen(
-            self.args, shell=False, env=env, preexec_fn=os.setpgrp,
-            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        out, err = self.process.communicate()
-        self.logger.debug("Finished running `%s'" % executable)
-        self.logger.info("Return code is `%s'" % self.process.returncode)
-        self.logger.info(single_line_delim)
-        self.logger.info("Executable `%s' wrote to stdout:" % executable)
-        self.logger.info(single_line_delim)
-        self.logger.info(out)
-        self.logger.info(single_line_delim)
-        self.logger.info("Executable `%s' wrote to stderr:" % executable)
-        self.logger.info(single_line_delim)
-        self.logger.error(err)
-        self.logger.info(single_line_delim)
-        self.result = self.process.returncode
+    running_on_centos, VppTestRunner, Worker
 
 
 @unittest.skipUnless(running_extended_tests(), "part of extended tests")
@@ -68,7 +34,8 @@ class VAPITestCase(VppTestCase):
                 os.killpg(os.getpgid(worker.process.pid), signal.SIGTERM)
                 worker.join()
             except:
-                raise Exception("Couldn't kill worker-spawned process")
+                self.logger.debug("Couldn't kill worker-spawned process")
+                raise
         if error:
             raise Exception(
                 "Timeout! Worker did not finish in %ss" % timeout)