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

diff --git a/test/test_vlib.py b/test/test_vlib.py
index 36a4340fa57..3c6288c8eb1 100644
--- a/test/test_vlib.py
+++ b/test/test_vlib.py
@@ -3,6 +3,7 @@
 import unittest
 
 from framework import VppTestCase, VppTestRunner, running_extended_tests
+from framework import running_gcov_tests
 from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
 
 
@@ -24,8 +25,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 """
 
@@ -40,7 +40,7 @@ class TestVlib(VppTestCase):
                 "   IP6: 00:d0:2d:5e:86:85 -> 00:0d:ea:d0:00:00\n"
                 "   ICMP: db00::1 -> db00::2\n"
                 "   incrementing 30\n"
-                "   }\n",
+                "   }\n"
                 "}\n",
                 "elog trace dispatch",
                 "event-logger stop",
@@ -67,6 +67,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 """
 
@@ -81,7 +82,7 @@ class TestVlib(VppTestCase):
                 "   IP6: 00:d0:2d:5e:86:85 -> 00:0d:ea:d0:00:00\n"
                 "   ICMP: db00::1 -> db00::2\n"
                 "   incrementing 30\n"
-                "   }\n",
+                "   }\n"
                 "}\n",
                 "show vlib graph",
                 "show vlib graph ethernet-input",
@@ -100,6 +101,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 +112,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 """
 
@@ -124,11 +127,55 @@ class TestVlib(VppTestCase):
                 "   IP6: 00:d0:2d:5e:86:85 -> 00:0d:ea:d0:00:00\n"
                 "   ICMP: db00::1 -> db00::2\n"
                 "   incrementing 30\n"
-                "   }\n",
+                "   }\n"
                 "}\n",
+                "elog trace",
+                "elog trace enable",
+                "elog 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",
+                "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:
+            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))
+
+    @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 match l2 proto 0x86dd",
+                "classify filter pcap del",
+                "test format-vlib",
                 ]
 
         for cmd in cmds: