Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bonding: support custom interface IDs
[vpp.git]
/
test
/
test_vapi.py
diff --git
a/test/test_vapi.py
b/test/test_vapi.py
index
b5820fa
..
ebd189c
100644
(file)
--- a/
test/test_vapi.py
+++ b/
test/test_vapi.py
@@
-4,24
+4,21
@@
import unittest
import os
import signal
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
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 """
def test_vapi_c(self):
""" run C VAPI tests """
class VAPITestCase(VppTestCase):
""" VAPI test """
def test_vapi_c(self):
""" run C VAPI tests """
- var = "
B
R"
+ var = "
TEST_DI
R"
built_root = os.getenv(var, None)
self.assertIsNotNone(built_root,
"Environment variable `%s' not set" % var)
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()
worker = Worker(
[executable, "vapi client", self.shm_prefix], self.logger)
worker.start()
@@
-37,20
+34,21
@@
class VAPITestCase(VppTestCase):
os.killpg(os.getpgid(worker.process.pid), signal.SIGTERM)
worker.join()
except:
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")
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 """
def test_vapi_cpp(self):
""" run C++ VAPI tests """
- var = "
B
R"
+ var = "
TEST_DI
R"
built_root = os.getenv(var, None)
self.assertIsNotNone(built_root,
"Environment variable `%s' not set" % var)
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()
worker = Worker(
[executable, "vapi client", self.shm_prefix], self.logger)
worker.start()