From d9b0c6fbf7aa5bd9af84264105b39c82028a4a29 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Tue, 26 Apr 2022 19:02:15 +0200 Subject: tests: replace pycodestyle with black Drop pycodestyle for code style checking in favor of black. Black is much faster, stable PEP8 compliant code style checker offering also automatic formatting. It aims to be very stable and produce smallest diffs. It's used by many small and big projects. Running checkstyle with black takes a few seconds with a terse output. Thus, test-checkstyle-diff is no longer necessary. Expand scope of checkstyle to all python files in the repo, replacing test-checkstyle with checkstyle-python. Also, fixstyle-python is now available for automatic style formatting. Note: python virtualenv has been consolidated in test/Makefile, test/requirements*.txt which will eventually be moved to a central location. This is required to simply the automated generation of docker executor images in the CI. Type: improvement Change-Id: I022a326603485f58585e879ac0f697fceefbc9c8 Signed-off-by: Klement Sekera Signed-off-by: Dave Wallace --- test/test_cli.py | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) (limited to 'test/test_cli.py') diff --git a/test/test_cli.py b/test/test_cli.py index 5005bf4c43a..77dfdc0b9ad 100644 --- a/test/test_cli.py +++ b/test/test_cli.py @@ -11,7 +11,8 @@ from framework import VppTestCase, VppTestRunner class TestCLI(VppTestCase): - """ CLI Test Case """ + """CLI Test Case""" + maxDiff = None @classmethod @@ -31,21 +32,21 @@ class TestCLI(VppTestCase): super(TestCLI, self).tearDown() def test_cli_retval(self): - """ CLI inband retval """ - rv = self.vapi.papi.cli_inband(cmd='this command does not exist') + """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') + 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 + """Test that VppApiClient raises VppIOError if timeout.""" # noqa with self.assertRaises(VPPIOError) as ctx: - rv = self.vapi.papi.cli_inband(cmd='wait 10') + 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) + """Test per-command _timeout option.""" # noqa + rv = self.vapi.papi.cli_inband(cmd="wait 10", _timeout=15) self.assertEqual(rv.retval, 0) @@ -55,8 +56,10 @@ class TestCLIExtendedVapiTimeout(VppTestCase): @classmethod def setUpClass(cls): cls.vapi_response_timeout = 15 - cls.__doc__ = " CLI Test Case w/ Extended (%ssec) Vapi Timeout " \ - % cls.vapi_response_timeout + cls.__doc__ = ( + " CLI Test Case w/ Extended (%ssec) Vapi Timeout " + % cls.vapi_response_timeout + ) super(TestCLIExtendedVapiTimeout, cls).setUpClass() @classmethod @@ -70,19 +73,21 @@ class TestCLIExtendedVapiTimeout(VppTestCase): super(TestCLIExtendedVapiTimeout, self).tearDown() def test_long_cli_delay(self): - """ Test that delayed result returns with extended timeout.""" + """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) + _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 + _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__': +if __name__ == "__main__": unittest.main(testRunner=VppTestRunner) -- cgit 1.2.3-korg