From 8de5fc2bd4aedf23ca505b7b97581deb12ade0ed Mon Sep 17 00:00:00 2001
From: Dave Wallace <dwallacelf@gmail.com>
Date: Mon, 16 Nov 2020 14:18:51 -0500
Subject: tests: move bihash tests to src/vppinfra/test

- Refactor make test code to be co-located with
  the vpp feature source code.

Type: test

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I0133a00def595fe1c08ab881633ef9f89148a286
---
 src/vppinfra/test/test_bihash.py | 71 ++++++++++++++++++++++++++++++++++++++++
 test/test_bihash.py              | 71 ----------------------------------------
 2 files changed, 71 insertions(+), 71 deletions(-)
 create mode 100644 src/vppinfra/test/test_bihash.py
 delete mode 100644 test/test_bihash.py

diff --git a/src/vppinfra/test/test_bihash.py b/src/vppinfra/test/test_bihash.py
new file mode 100644
index 00000000000..019929a0a72
--- /dev/null
+++ b/src/vppinfra/test/test_bihash.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+
+import unittest
+
+from framework import VppTestCase, VppTestRunner, running_gcov_tests
+from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
+
+
+class TestBihash(VppTestCase):
+    """ Bihash Test Cases """
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestBihash, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestBihash, cls).tearDownClass()
+
+    def setUp(self):
+        super(TestBihash, self).setUp()
+
+    def tearDown(self):
+        super(TestBihash, self).tearDown()
+
+    def test_bihash_unittest(self):
+        """ Bihash Add/Del Test """
+        error = self.vapi.cli("test bihash careful 0 verbose 0")
+
+        if error:
+            self.logger.critical(error)
+            self.assertNotIn('failed', error)
+
+    def test_bihash_thread(self):
+        """ Bihash Thread Test """
+
+        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.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)
diff --git a/test/test_bihash.py b/test/test_bihash.py
deleted file mode 100644
index 019929a0a72..00000000000
--- a/test/test_bihash.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env python3
-
-import unittest
-
-from framework import VppTestCase, VppTestRunner, running_gcov_tests
-from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
-
-
-class TestBihash(VppTestCase):
-    """ Bihash Test Cases """
-
-    @classmethod
-    def setUpClass(cls):
-        super(TestBihash, cls).setUpClass()
-
-    @classmethod
-    def tearDownClass(cls):
-        super(TestBihash, cls).tearDownClass()
-
-    def setUp(self):
-        super(TestBihash, self).setUp()
-
-    def tearDown(self):
-        super(TestBihash, self).tearDown()
-
-    def test_bihash_unittest(self):
-        """ Bihash Add/Del Test """
-        error = self.vapi.cli("test bihash careful 0 verbose 0")
-
-        if error:
-            self.logger.critical(error)
-            self.assertNotIn('failed', error)
-
-    def test_bihash_thread(self):
-        """ Bihash Thread Test """
-
-        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.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)
-- 
cgit 1.2.3-korg