Add C++ API

[vpp.git] / test / test_vapi.py

diff --git a/test/test_vapi.py b/test/test_vapi.py
index 86c1ee0..d8e1ebe 100644 (file)
--- a/test/test_vapi.py
+++ b/test/test_vapi.py
@@ -45,17 +45,45 @@ class Worker(Thread):
 class VAPITestCase(VppTestCase):
     """ VAPI test """
 
-    def test_vapi(self):
-        """ run VAPI tests """
+    def test_vapi_c(self):
+        """ run C VAPI tests """
         var = "BR"
         built_root = os.getenv(var, None)
         self.assertIsNotNone(built_root,
                              "Environment variable `%s' not set" % var)
-        executable = "%s/vapi_test/vapi_test" % built_root
+        executable = "%s/vapi_test/vapi_c_test" % built_root
         worker = Worker(
             [executable, "vapi client", self.shm_prefix], self.logger)
         worker.start()
-        timeout = 45
+        timeout = 60
+        worker.join(timeout)
+        self.logger.info("Worker result is `%s'" % worker.result)
+        error = False
+        if worker.result is None:
+            try:
+                error = True
+                self.logger.error(
+                    "Timeout! Worker did not finish in %ss" % timeout)
+                os.killpg(os.getpgid(worker.process.pid), signal.SIGTERM)
+                worker.join()
+            except:
+                raise Exception("Couldn't kill worker-spawned process")
+        if error:
+            raise Exception(
+                "Timeout! Worker did not finish in %ss" % timeout)
+        self.assert_equal(worker.result, 0, "Binary test return code")
+
+    def test_vapi_cpp(self):
+        """ run C++ VAPI tests """
+        var = "BR"
+        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
+        worker = Worker(
+            [executable, "vapi client", self.shm_prefix], self.logger)
+        worker.start()
+        timeout = 120
         worker.join(timeout)
         self.logger.info("Worker result is `%s'" % worker.result)
         error = False