Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vat2: coverity errors in print_template
[vpp.git]
/
test
/
test_vapi.py
diff --git
a/test/test_vapi.py
b/test/test_vapi.py
index
b5820fa
..
9b4cad0
100644
(file)
--- a/
test/test_vapi.py
+++ b/
test/test_vapi.py
@@
-1,29
+1,32
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
3
""" VAPI test """
import unittest
import os
import signal
""" VAPI test """
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, VppTestRunner, Worker
-@unittest.skipUnless(running_extended_tests(), "part of extended tests")
class VAPITestCase(VppTestCase):
""" VAPI test """
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 """
def test_vapi_c(self):
""" run C VAPI tests """
- var = "
B
R"
- buil
t_root
= os.getenv(var, None)
- self.assertIsNotNone(buil
t_root
,
+ var = "
VPP_BUILD_DI
R"
+ buil
d_dir
= os.getenv(var, None)
+ self.assertIsNotNone(buil
d_dir
,
"Environment variable `%s' not set" % var)
"Environment variable `%s' not set" % var)
- executable =
"%s/vapi_test/vapi_c_test" % built_root
- worker = Worker(
-
[executable, "vapi client", self.shm_prefix
], self.logger)
+ executable =
f"{build_dir}/vpp/bin/vapi_c_test"
+ worker = Worker(
[executable, "vapi client",
+
self.get_api_segment_prefix()
], self.logger)
worker.start()
timeout = 60
worker.join(timeout)
worker.start()
timeout = 60
worker.join(timeout)
@@
-37,22
+40,22
@@
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++")
def test_vapi_cpp(self):
""" run C++ VAPI tests """
def test_vapi_cpp(self):
""" run C++ VAPI tests """
- var = "
B
R"
- buil
t_root
= os.getenv(var, None)
- self.assertIsNotNone(buil
t_root
,
+ var = "
VPP_BUILD_DI
R"
+ buil
d_dir
= os.getenv(var, None)
+ self.assertIsNotNone(buil
d_dir
,
"Environment variable `%s' not set" % var)
"Environment variable `%s' not set" % var)
- executable =
"%s/vapi_test/vapi_cpp_test" % built_root
- worker = Worker(
-
[executable, "vapi client", self.shm_prefix
], self.logger)
+ executable =
f"{build_dir}/vpp/bin/vapi_cpp_test"
+ worker = Worker(
[executable, "vapi client",
+
self.get_api_segment_prefix()
], self.logger)
worker.start()
timeout = 120
worker.join(timeout)
worker.start()
timeout = 120
worker.join(timeout)