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_session.py | 66 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 26 deletions(-) (limited to 'test/test_session.py') diff --git a/test/test_session.py b/test/test_session.py index 6c48e5467db..699ebafc386 100644 --- a/test/test_session.py +++ b/test/test_session.py @@ -10,7 +10,7 @@ from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath @tag_fixme_vpp_workers class TestSession(VppTestCase): - """ Session Test Case """ + """Session Test Case""" @classmethod def setUpClass(cls): @@ -40,10 +40,12 @@ class TestSession(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add_del(namespace_id="0", - sw_if_index=self.loop0.sw_if_index) - self.vapi.app_namespace_add_del(namespace_id="1", - sw_if_index=self.loop1.sw_if_index) + self.vapi.app_namespace_add_del( + namespace_id="0", sw_if_index=self.loop0.sw_if_index + ) + self.vapi.app_namespace_add_del( + namespace_id="1", sw_if_index=self.loop1.sw_if_index + ) def tearDown(self): for i in self.lo_interfaces: @@ -55,31 +57,42 @@ class TestSession(VppTestCase): self.vapi.session_enable_disable(is_enable=1) def test_segment_manager_alloc(self): - """ Session Segment Manager Multiple Segment Allocation """ + """Session Segment Manager Multiple Segment Allocation""" # Add inter-table routes - ip_t01 = VppIpRoute(self, self.loop1.local_ip4, 32, - [VppRoutePath("0.0.0.0", - 0xffffffff, - nh_table_id=1)]) - ip_t10 = VppIpRoute(self, self.loop0.local_ip4, 32, - [VppRoutePath("0.0.0.0", - 0xffffffff, - nh_table_id=0)], table_id=1) + ip_t01 = VppIpRoute( + self, + self.loop1.local_ip4, + 32, + [VppRoutePath("0.0.0.0", 0xFFFFFFFF, nh_table_id=1)], + ) + ip_t10 = VppIpRoute( + self, + self.loop0.local_ip4, + 32, + [VppRoutePath("0.0.0.0", 0xFFFFFFFF, nh_table_id=0)], + table_id=1, + ) ip_t01.add_vpp_config() ip_t10.add_vpp_config() # Start builtin server and client with small private segments uri = "tcp://" + self.loop0.local_ip4 + "/1234" - error = self.vapi.cli("test echo server appns 0 fifo-size 64 " + - "private-segment-size 1m uri " + uri) + error = self.vapi.cli( + "test echo server appns 0 fifo-size 64 " + + "private-segment-size 1m uri " + + uri + ) if error: self.logger.critical(error) self.assertNotIn("failed", error) - error = self.vapi.cli("test echo client nclients 100 appns 1 " + - "no-output fifo-size 64 syn-timeout 2 " + - "private-segment-size 1m uri " + uri) + error = self.vapi.cli( + "test echo client nclients 100 appns 1 " + + "no-output fifo-size 64 syn-timeout 2 " + + "private-segment-size 1m uri " + + uri + ) if error: self.logger.critical(error) self.assertNotIn("failed", error) @@ -94,7 +107,7 @@ class TestSession(VppTestCase): @tag_fixme_vpp_workers class TestSessionUnitTests(VppTestCase): - """ Session Unit Tests Case """ + """Session Unit Tests Case""" @classmethod def setUpClass(cls): @@ -109,7 +122,7 @@ class TestSessionUnitTests(VppTestCase): self.vapi.session_enable_disable(is_enable=1) def test_session(self): - """ Session Unit Tests """ + """Session Unit Tests""" error = self.vapi.cli("test session all") if error: @@ -123,7 +136,7 @@ class TestSessionUnitTests(VppTestCase): @tag_run_solo class TestSegmentManagerTests(VppTestCase): - """ SVM Fifo Unit Tests Case """ + """SVM Fifo Unit Tests Case""" @classmethod def setUpClass(cls): @@ -137,7 +150,7 @@ class TestSegmentManagerTests(VppTestCase): super(TestSegmentManagerTests, self).setUp() def test_segment_manager(self): - """ Segment manager Tests """ + """Segment manager Tests""" error = self.vapi.cli("test segment-manager all") if error: @@ -150,7 +163,7 @@ class TestSegmentManagerTests(VppTestCase): @tag_run_solo class TestSvmFifoUnitTests(VppTestCase): - """ SVM Fifo Unit Tests Case """ + """SVM Fifo Unit Tests Case""" @classmethod def setUpClass(cls): @@ -164,7 +177,7 @@ class TestSvmFifoUnitTests(VppTestCase): super(TestSvmFifoUnitTests, self).setUp() def test_svm_fifo(self): - """ SVM Fifo Unit Tests """ + """SVM Fifo Unit Tests""" error = self.vapi.cli("test svm fifo all") if error: @@ -174,5 +187,6 @@ class TestSvmFifoUnitTests(VppTestCase): def tearDown(self): super(TestSvmFifoUnitTests, self).tearDown() -if __name__ == '__main__': + +if __name__ == "__main__": unittest.main(testRunner=VppTestRunner) -- cgit 1.2.3-korg