tests: move test source to vpp/test

- Generate copyright year and version
  instead of using hard-coded data

Type: refactor

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I6058f5025323b3aa483f5df4a2c4371e27b5914e

2 files changed, 0 insertions, 114 deletions

diff --git a/src/vppinfra/test/test_bihash.py b/src/vppinfra/test/test_bihash.py
deleted file mode 100644
index 2949d66750d..00000000000
--- a/src/vppinfra/test/test_bihash.py
+++ /dev/null
@@ -1,74 +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):
-        # 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
-    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/src/vppinfra/test/test_vppinfra.py b/src/vppinfra/test/test_vppinfra.py
deleted file mode 100644
index 8b6ec965fea..00000000000
--- a/src/vppinfra/test/test_vppinfra.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-
-import unittest
-
-from framework import VppTestCase, VppTestRunner, running_extended_tests
-from framework import running_gcov_tests
-
-
-class TestVppinfra(VppTestCase):
-    """ Vppinfra Unit Test Cases """
-    vpp_worker_count = 1
-
-    @classmethod
-    def setUpClass(cls):
-        super(TestVppinfra, cls).setUpClass()
-
-    @classmethod
-    def tearDownClass(cls):
-        super(TestVppinfra, cls).tearDownClass()
-
-    def setUp(self):
-        super(TestVppinfra, self).setUp()
-
-    def tearDown(self):
-        super(TestVppinfra, self).tearDown()
-
-    def test_bitmap_unittest(self):
-        """ Bitmap Code Coverage Test """
-        cmds = ["test bitmap"]
-
-        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)