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
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()
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)
@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()