From eddd8e3588561039985b27edf059db6033bfdfab Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Wed, 12 May 2021 21:43:59 -0400 Subject: 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 Change-Id: I6058f5025323b3aa483f5df4a2c4371e27b5914e --- src/vlib/test/test_buffers.py | 29 -------------- src/vlib/test/test_cli.py | 88 ------------------------------------------ src/vlib/test/test_counters.py | 39 ------------------- 3 files changed, 156 deletions(-) delete mode 100644 src/vlib/test/test_buffers.py delete mode 100644 src/vlib/test/test_cli.py delete mode 100644 src/vlib/test/test_counters.py (limited to 'src/vlib/test') diff --git a/src/vlib/test/test_buffers.py b/src/vlib/test/test_buffers.py deleted file mode 100644 index f50f05c609a..00000000000 --- a/src/vlib/test/test_buffers.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python3 - -from framework import VppTestCase - - -class TestBuffers(VppTestCase): - """ Buffer C Unit Tests """ - - @classmethod - def setUpClass(cls): - super(TestBuffers, cls).setUpClass() - - @classmethod - def tearDownClass(cls): - super(TestBuffers, cls).tearDownClass() - - def setUp(self): - super(TestBuffers, self).setUp() - - def tearDown(self): - super(TestBuffers, self).tearDown() - - def test_linearize(self): - """ Chained Buffer Linearization """ - error = self.vapi.cli("test chained-buffer-linearization") - - if error: - self.logger.critical(error) - self.assertNotIn('failed', error) diff --git a/src/vlib/test/test_cli.py b/src/vlib/test/test_cli.py deleted file mode 100644 index 5005bf4c43a..00000000000 --- a/src/vlib/test/test_cli.py +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/env python3 -"""CLI functional tests""" - -import datetime -import time -import unittest - -from vpp_papi import VPPIOError - -from framework import VppTestCase, VppTestRunner - - -class TestCLI(VppTestCase): - """ CLI Test Case """ - maxDiff = None - - @classmethod - def setUpClass(cls): - # using the framework default - cls.vapi_response_timeout = 5 - super(TestCLI, cls).setUpClass() - - @classmethod - def tearDownClass(cls): - super(TestCLI, cls).tearDownClass() - - def setUp(self): - super(TestCLI, self).setUp() - - def tearDown(self): - super(TestCLI, self).tearDown() - - def test_cli_retval(self): - """ CLI inband retval """ - rv = self.vapi.papi.cli_inband(cmd='this command does not exist') - self.assertNotEqual(rv.retval, 0) - - rv = self.vapi.papi.cli_inband(cmd='show version') - self.assertEqual(rv.retval, 0) - - def test_long_cli_delay(self): - """ Test that VppApiClient raises VppIOError if timeout.""" # noqa - with self.assertRaises(VPPIOError) as ctx: - rv = self.vapi.papi.cli_inband(cmd='wait 10') - - def test_long_cli_delay_override(self): - """ Test per-command _timeout option.""" # noqa - rv = self.vapi.papi.cli_inband(cmd='wait 10', _timeout=15) - self.assertEqual(rv.retval, 0) - - -class TestCLIExtendedVapiTimeout(VppTestCase): - maxDiff = None - - @classmethod - def setUpClass(cls): - cls.vapi_response_timeout = 15 - cls.__doc__ = " CLI Test Case w/ Extended (%ssec) Vapi Timeout " \ - % cls.vapi_response_timeout - super(TestCLIExtendedVapiTimeout, cls).setUpClass() - - @classmethod - def tearDownClass(cls): - super(TestCLIExtendedVapiTimeout, cls).tearDownClass() - - def setUp(self): - super(TestCLIExtendedVapiTimeout, self).setUp() - - def tearDown(self): - super(TestCLIExtendedVapiTimeout, self).tearDown() - - def test_long_cli_delay(self): - """ Test that delayed result returns with extended timeout.""" - wait_secs = self.vapi_response_timeout - 1 - - # get vpp time as float - start = self.vapi.papi.show_vpe_system_time( - _no_type_conversion=True).vpe_system_time - rv = self.vapi.papi.cli_inband(cmd='wait %s' % wait_secs) - now = self.vapi.papi.show_vpe_system_time( - _no_type_conversion=True).vpe_system_time - - # assume that the overhead of the measurement is not more that .5 sec. - self.assertEqual(round(now - start), wait_secs) - - -if __name__ == '__main__': - unittest.main(testRunner=VppTestRunner) diff --git a/src/vlib/test/test_counters.py b/src/vlib/test/test_counters.py deleted file mode 100644 index e4cb85621d0..00000000000 --- a/src/vlib/test/test_counters.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python3 - -from framework import VppTestCase -from framework import tag_fixme_vpp_workers - - -@tag_fixme_vpp_workers -class TestCounters(VppTestCase): - """ Counters C Unit Tests """ - - @classmethod - def setUpClass(cls): - super(TestCounters, cls).setUpClass() - - @classmethod - def tearDownClass(cls): - super(TestCounters, cls).tearDownClass() - - def setUp(self): - super(TestCounters, self).setUp() - - def tearDown(self): - super(TestCounters, self).tearDown() - - def test_counter_simple_expand(self): - """ Simple Counter Expand """ - error = self.vapi.cli("test counter simple expand") - - if error: - self.logger.critical(error) - self.assertNotIn('failed', error) - - def test_counter_combined_expand(self): - """ Combined Counter Expand """ - error = self.vapi.cli("test counter combined expand") - - if error: - self.logger.critical(error) - self.assertNotIn('failed', error) -- cgit 1.2.3-korg