tests: make tests less make dependent

[vpp.git] / test / test_bihash.py

diff --git a/test/test_bihash.py b/test/test_bihash.py
index ac8bab3..32eb4ff 100644 (file)
--- a/test/test_bihash.py
+++ b/test/test_bihash.py
@@ -2,7 +2,8 @@
 
 import unittest
 
-from framework import VppTestCase, VppTestRunner, running_gcov_tests
+from config import config
+from framework import VppTestCase, VppTestRunner
 from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
 
 
@@ -11,6 +12,9 @@ class TestBihash(VppTestCase):
 
     @classmethod
     def setUpClass(cls):
+        # increase vapi timeout, to avoid spurious "test bihash ..."
+        # failures reported on aarch64 w/ test-debug
+        cls.vapi_response_timeout = 20
         super(TestBihash, cls).setUpClass()
 
     @classmethod
@@ -50,7 +54,7 @@ class TestBihash(VppTestCase):
             self.logger.critical(error)
             self.assertNotIn('failed', error)
 
-    @unittest.skipUnless(running_gcov_tests, "part of code coverage tests")
+    @unittest.skipUnless(config.gcov, "part of code coverage tests")
     def test_bihash_coverage(self):
         """ Improve Code Coverage """
 
@@ -61,5 +65,11 @@ class TestBihash(VppTestCase):
             self.logger.critical(error)
             self.assertNotIn('failed', error)
 
+        error = self.vapi.cli("test bihash nitems 10 nbuckets 1 ncycles 3" +
+                              "search 2 careful 1 verbose 2 non-random-keys")
+        if error:
+            self.logger.critical(error)
+            self.assertNotIn('failed', error)
+
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)