X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vapi.py;h=7bb815d77f3069efcc693cb6abc55a7939962171;hb=17fcd989f417555b1c2edfe626add5cc6f620812;hp=b5820fa181bf71a59d0a5eb14c02450f56194fa3;hpb=812ed39f9da336310e815c361ab5a9f118657d94;p=vpp.git

diff --git a/test/test_vapi.py b/test/test_vapi.py
index b5820fa181b..7bb815d77f3 100644
--- a/test/test_vapi.py
+++ b/test/test_vapi.py
@@ -4,24 +4,29 @@
 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, Worker
 
 
-@unittest.skipUnless(running_extended_tests(), "part of extended tests")
+@unittest.skipUnless(running_extended_tests, "part of extended tests")
 class VAPITestCase(VppTestCase):
     """ VAPI test """
 
+    @classmethod
+    def setUpClass(cls):
+        super(VAPITestCase, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(VAPITestCase, cls).tearDownClass()
+
     def test_vapi_c(self):
         """ run C VAPI tests """
-        var = "BR"
+        var = "TEST_DIR"
         built_root = os.getenv(var, None)
         self.assertIsNotNone(built_root,
                              "Environment variable `%s' not set" % var)
-        executable = "%s/vapi_test/vapi_c_test" % built_root
+        executable = "%s/build/vapi_test/vapi_c_test" % built_root
         worker = Worker(
             [executable, "vapi client", self.shm_prefix], self.logger)
         worker.start()
@@ -37,20 +42,21 @@ 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)
         self.assert_equal(worker.result, 0, "Binary test return code")
 
-    @unittest.skipIf(running_on_centos(), "Centos's gcc can't compile our C++")
+    @unittest.skipIf(running_on_centos, "Centos's gcc can't compile our C++")
     def test_vapi_cpp(self):
         """ run C++ VAPI tests """
-        var = "BR"
+        var = "TEST_DIR"
         built_root = os.getenv(var, None)
         self.assertIsNotNone(built_root,
                              "Environment variable `%s' not set" % var)
-        executable = "%s/vapi_test/vapi_cpp_test" % built_root
+        executable = "%s/build/vapi_test/vapi_cpp_test" % built_root
         worker = Worker(
             [executable, "vapi client", self.shm_prefix], self.logger)
         worker.start()