X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vapi.py;h=1a4293d7888a295f0f1d1acb501667b8a713ed03;hb=282872127;hp=7bb815d77f3069efcc693cb6abc55a7939962171;hpb=8d991d923b52a2692370bfa33902d29ff5d2f826;p=vpp.git diff --git a/test/test_vapi.py b/test/test_vapi.py index 7bb815d77f3..1a4293d7888 100644 --- a/test/test_vapi.py +++ b/test/test_vapi.py @@ -1,14 +1,12 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ VAPI test """ import unittest import os import signal -from framework import VppTestCase, running_extended_tests, \ - running_on_centos, VppTestRunner, Worker +from framework import VppTestCase, running_on_centos, VppTestRunner, Worker -@unittest.skipUnless(running_extended_tests, "part of extended tests") class VAPITestCase(VppTestCase): """ VAPI test """ @@ -22,11 +20,11 @@ class VAPITestCase(VppTestCase): def test_vapi_c(self): """ run C VAPI tests """ - var = "TEST_DIR" + var = "TEST_BR" built_root = os.getenv(var, None) self.assertIsNotNone(built_root, "Environment variable `%s' not set" % var) - executable = "%s/build/vapi_test/vapi_c_test" % built_root + executable = "%s/vapi_test/vapi_c_test" % built_root worker = Worker( [executable, "vapi client", self.shm_prefix], self.logger) worker.start() @@ -52,11 +50,11 @@ class VAPITestCase(VppTestCase): @unittest.skipIf(running_on_centos, "Centos's gcc can't compile our C++") def test_vapi_cpp(self): """ run C++ VAPI tests """ - var = "TEST_DIR" + var = "TEST_BR" built_root = os.getenv(var, None) self.assertIsNotNone(built_root, "Environment variable `%s' not set" % var) - executable = "%s/build/vapi_test/vapi_cpp_test" % built_root + executable = "%s/vapi_test/vapi_cpp_test" % built_root worker = Worker( [executable, "vapi client", self.shm_prefix], self.logger) worker.start()