X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vlib.py;h=a9a5f6aeb891500b5152aea6afc6e1d3ed754736;hb=eee099e9579083fbce665e8c4a3617b9f0e5ea2f;hp=3c6288c8eb162ed1f627c7f93050cdc637b01d6c;hpb=d498c9eb2b70b744b6231d5db714422f8745caaf;p=vpp.git

diff --git a/test/test_vlib.py b/test/test_vlib.py
index 3c6288c8eb1..a9a5f6aeb89 100644
--- a/test/test_vlib.py
+++ b/test/test_vlib.py
@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
 
 import unittest
-
+import pexpect
+import time
+import signal
 from framework import VppTestCase, VppTestRunner, running_extended_tests
 from framework import running_gcov_tests
 from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
@@ -9,7 +11,7 @@ from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
 
 class TestVlib(VppTestCase):
     """ Vlib Unit Test Cases """
-    worker_config = "workers 1"
+    vpp_worker_count = 1
 
     @classmethod
     def setUpClass(cls):
@@ -42,13 +44,12 @@ class TestVlib(VppTestCase):
                 "   incrementing 30\n"
                 "   }\n"
                 "}\n",
-                "elog trace dispatch",
+                "event-logger trace dispatch",
                 "event-logger stop",
                 "event-logger clear",
                 "event-logger resize 102400",
                 "event-logger restart",
                 "pcap dispatch trace on max 100 buffer-trace pg-input 15",
-                "set pmc instructions-per-clock",
                 "pa en",
                 "show event-log 100 all",
                 "event-log save",
@@ -129,14 +130,14 @@ class TestVlib(VppTestCase):
                 "   incrementing 30\n"
                 "   }\n"
                 "}\n",
-                "elog trace",
-                "elog trace enable",
-                "elog trace api cli barrier",
+                "event-logger trace",
+                "event-logger trace enable",
+                "event-logger trace api cli barrier",
                 "pa en",
                 "show interface bogus",
-                "elog trace disable api cli barrier",
-                "elog trace circuit-node ethernet-input",
-                "elog trace circuit-node ethernet-input disable",
+                "event-logger trace disable api cli barrier",
+                "event-logger trace circuit-node ethernet-input",
+                "event-logger trace circuit-node ethernet-input disable",
                 "clear interfaces",
                 "test vlib",
                 "test vlib2",
@@ -186,5 +187,23 @@ class TestVlib(VppTestCase):
                 else:
                     self.logger.info(cmd + " FAIL retval " + str(r.retval))
 
+    @unittest.skipUnless(running_gcov_tests, "part of code coverage tests")
+    def test_vlib_main_unittest(self):
+        """ Private Binary API Segment Test (takes 70 seconds) """
+
+        vat_path = self.vpp_bin + '_api_test'
+        vat = pexpect.spawn(vat_path, ['socket-name',
+                                       self.get_api_sock_path()])
+        vat.expect("vat# ", timeout=10)
+        vat.sendline('sock_init_shm')
+        vat.expect("vat# ", timeout=10)
+        vat.sendline('sh api cli')
+        vat.kill(signal.SIGKILL)
+        vat.wait()
+        self.logger.info("vat terminated, 70 second wait for the Reaper")
+        time.sleep(70)
+        self.logger.info("Reaper should be complete...")
+
+
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)