X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vlib.py;h=31fb72990f054f3343f07c823efb0f4edc4d12e2;hb=8034a36a9cedc95f6762bf0a07f6617d0bf69bfe;hp=aa58667aa70fda4668a3bb0857e97e277d0237d4;hpb=41a817a318b19daf18ed616b7d7bc461d5ad5088;p=vpp.git

diff --git a/test/test_vlib.py b/test/test_vlib.py
index aa58667aa70..31fb72990f0 100644
--- a/test/test_vlib.py
+++ b/test/test_vlib.py
@@ -1,14 +1,17 @@
 #!/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
 
 
 class TestVlib(VppTestCase):
     """ Vlib Unit Test Cases """
-    worker_config = "workers 1"
+    vpp_worker_count = 1
 
     @classmethod
     def setUpClass(cls):
@@ -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 """
 
@@ -100,6 +102,7 @@ class TestVlib(VppTestCase):
                 "set node function ethernet-input default",
                 "set node function ethernet-input bozo",
                 "set node function ethernet-input",
+                "show \t",
                 ]
 
         for cmd in cmds:
@@ -110,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 """
 
@@ -126,10 +130,35 @@ class TestVlib(VppTestCase):
                 "   incrementing 30\n"
                 "   }\n"
                 "}\n",
+                "event-logger trace",
+                "event-logger trace enable",
+                "event-logger trace api cli barrier",
                 "pa en",
+                "show interface bogus",
+                "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",
+                "show memory api-segment stats-segment main-heap verbose",
+                "leak-check { show memory }",
+                "show cpu",
+                "memory-trace main-heap",
+                "memory-trace main-heap api-segment stats-segment",
+                "leak-check { show version }",
+                "show version ?",
+                "comment { show version }",
+                "uncomment { show version }",
+                "show memory main-heap",
+                "show memory bogus",
+                "choices",
+                "test heap-validate",
+                "memory-trace main-heap disable",
                 "show buffers",
+                "show eve",
+                "show help",
+                "show ip ",
                 ]
 
         for cmd in cmds:
@@ -140,12 +169,13 @@ 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 """
 
         cmds = ["loopback create",
-                "classify filter pcap mask l2 proto ipv6 match l2 proto 86dd",
-                "classify filter del",
+                "classify filter pcap mask l2 proto match l2 proto 0x86dd",
+                "classify filter pcap del",
                 "test format-vlib",
                 ]
 
@@ -157,5 +187,36 @@ 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...")
+
+    def test_pool(self):
+        """ Fixed-size Pool Test """
+
+        cmds = ["test pool",
+                ]
+
+        for cmd in cmds:
+            r = self.vapi.cli_return_response(cmd)
+            if r.retval != 0:
+                if hasattr(r, 'reply'):
+                    self.logger.info(cmd + " FAIL reply " + r.reply)
+                else:
+                    self.logger.info(cmd + " FAIL retval " + str(r.retval))
+
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)