X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_bihash.py;h=ac8bab37a7d0c1376fd3cf6f8ea5ae689f9e9e43;hb=61717cc38;hp=ff2a898dae348a5ed8a1f9b67faae6d8b2496698;hpb=8e26f6dbcf5a61fa2922f57edf04e1de18cdd4fc;p=vpp.git

diff --git a/test/test_bihash.py b/test/test_bihash.py
index ff2a898dae3..ac8bab37a7d 100644
--- a/test/test_bihash.py
+++ b/test/test_bihash.py
@@ -1,8 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
-from framework import VppTestCase, VppTestRunner
+from framework import VppTestCase, VppTestRunner, running_gcov_tests
 from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
 
 
@@ -13,6 +13,10 @@ class TestBihash(VppTestCase):
     def setUpClass(cls):
         super(TestBihash, cls).setUpClass()
 
+    @classmethod
+    def tearDownClass(cls):
+        super(TestBihash, cls).tearDownClass()
+
     def setUp(self):
         super(TestBihash, self).setUp()
 
@@ -21,20 +25,41 @@ class TestBihash(VppTestCase):
 
     def test_bihash_unittest(self):
         """ Bihash Add/Del Test """
-        error = self.vapi.cli("test bihash ")
+        error = self.vapi.cli("test bihash careful 0 verbose 0")
 
         if error:
             self.logger.critical(error)
-        self.assertEqual(error.find("failed"), -1)
+            self.assertNotIn('failed', error)
 
     def test_bihash_thread(self):
         """ Bihash Thread Test """
 
-        error = self.vapi.cli("test bihash threads 2 nbuckets 64000")
+        error = self.vapi.cli("test bihash threads 2 nbuckets" +
+                              " 64000 careful 0 verbose 0")
+
+        if error:
+            self.logger.critical(error)
+            self.assertNotIn('failed', error)
+
+    def test_bihash_vec64(self):
+        """ Bihash vec64 Test """
+
+        error = self.vapi.cli("test bihash vec64")
+
+        if error:
+            self.logger.critical(error)
+            self.assertNotIn('failed', error)
+
+    @unittest.skipUnless(running_gcov_tests, "part of code coverage tests")
+    def test_bihash_coverage(self):
+        """ Improve Code Coverage """
+
+        error = self.vapi.cli("test bihash nitems 10 ncycles 3" +
+                              "search 2 careful 1 verbose 2 non-random-keys")
 
         if error:
             self.logger.critical(error)
-            self.assertEqual(error.find("failed"), -1)
+            self.assertNotIn('failed', error)
 
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)