X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vlib.py;h=89ccb396ecd24747e88f881e3692afb1d6992e98;hb=a31698bb7401f6e2389c0e805bf280ae52278524;hp=33dc602cf2a6a45f2baf29bd7299de188443ff04;hpb=29c6132108be68feb11c8d9bfaaf674cba86ee33;p=vpp.git

diff --git a/test/test_vlib.py b/test/test_vlib.py
index 33dc602cf2a..89ccb396ecd 100644
--- a/test/test_vlib.py
+++ b/test/test_vlib.py
@@ -1,8 +1,11 @@
 #!/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
 
 
@@ -24,8 +27,7 @@ class TestVlib(VppTestCase):
     def tearDown(self):
         super(TestVlib, self).tearDown()
 
-    # @unittest.skipUnless(running_extended_tests, "part of extended tests")
-
+    @unittest.skipUnless(running_gcov_tests, "part of code coverage tests")
     def test_vlib_main_unittest(self):
         """ Vlib main.c Code Coverage Test """
 
@@ -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",
@@ -67,6 +68,7 @@ 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_node_cli_unittest(self):
         """ Vlib node_cli.c Code Coverage Test """
 
@@ -111,6 +113,7 @@ 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_buffer_c_unittest(self):
         """ Vlib buffer.c Code Coverage Test """
 
@@ -127,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",
@@ -166,6 +169,7 @@ 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_format_unittest(self):
         """ Vlib format.c Code Coverage Test """
 
@@ -183,5 +187,21 @@ 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.api_sock])
+        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)