diff options
author | Klement Sekera <klement.sekera@gmail.com> | 2022-04-26 19:02:15 +0200 |
---|---|---|
committer | Ole Tr�an <otroan@employees.org> | 2022-05-10 18:52:08 +0000 |
commit | d9b0c6fbf7aa5bd9af84264105b39c82028a4a29 (patch) | |
tree | 4f786cfd8ebc2443cb11e11b74c8657204068898 /test/test_node_variants.py | |
parent | f90348bcb4afd0af2611cefc43b17ef3042b511c (diff) |
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 <klement.sekera@gmail.com>
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'test/test_node_variants.py')
-rw-r--r-- | test/test_node_variants.py | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/test/test_node_variants.py b/test/test_node_variants.py index 3632910e3cb..a5c9137f9ba 100644 --- a/test/test_node_variants.py +++ b/test/test_node_variants.py @@ -13,15 +13,14 @@ def skipVariant(variant): with open("/proc/cpuinfo") as f: cpuinfo = f.read() - exp = re.compile( - r'(?:flags\s+:)(?:\s\w+)+(?:\s(' + variant + r'))(?:\s\w+)+') + exp = re.compile(r"(?:flags\s+:)(?:\s\w+)+(?:\s(" + variant + r"))(?:\s\w+)+") match = exp.search(cpuinfo, re.DOTALL | re.MULTILINE) return checkX86() and match is not None class TestNodeVariant(VppTestCase): - """ Test Node Variants """ + """Test Node Variants""" @classmethod def setUpConstants(cls, variant): @@ -30,9 +29,10 @@ class TestNodeVariant(VppTestCase): if checkX86(): node_variants = cls.vpp_cmdline.index("node { ") + 1 - cls.vpp_cmdline[node_variants] = ("default { variant default } " - "ip4-rewrite { variant " + - variant + " } ") + cls.vpp_cmdline[node_variants] = ( + "default { variant default } " + "ip4-rewrite { variant " + variant + " } " + ) @classmethod def setUpClass(cls): @@ -52,13 +52,14 @@ class TestNodeVariant(VppTestCase): node_desc = self.vapi.cli("show node " + node) self.logger.info(node_desc) - match = re.search(r'\s+(\S+)\s+(\d+)\s+(:?yes)', - node_desc, re.DOTALL | re.MULTILINE) + match = re.search( + r"\s+(\S+)\s+(\d+)\s+(:?yes)", node_desc, re.DOTALL | re.MULTILINE + ) return match.groups(0) def checkVariant(self, variant): - """ Test node variants defaults """ + """Test node variants defaults""" variant_info = self.getActiveVariant("ip4-lookup") self.assertEqual(variant_info[0], "default") @@ -68,7 +69,7 @@ class TestNodeVariant(VppTestCase): class TestICLVariant(TestNodeVariant): - """ Test icl Node Variants """ + """Test icl Node Variants""" VARIANT = "icl" LINUX_VARIANT = "avx512_bitalg" @@ -85,14 +86,15 @@ class TestICLVariant(TestNodeVariant): def tearDownClass(cls): super(TestICLVariant, cls).tearDownClass() - @unittest.skipUnless(skipVariant(LINUX_VARIANT), - VARIANT + " not a supported variant, skip.") + @unittest.skipUnless( + skipVariant(LINUX_VARIANT), VARIANT + " not a supported variant, skip." + ) def test_icl(self): self.checkVariant(self.VARIANT) class TestSKXVariant(TestNodeVariant): - """ Test skx Node Variants """ + """Test skx Node Variants""" VARIANT = "skx" LINUX_VARIANT = "avx512f" @@ -109,14 +111,15 @@ class TestSKXVariant(TestNodeVariant): def tearDownClass(cls): super(TestSKXVariant, cls).tearDownClass() - @unittest.skipUnless(skipVariant(LINUX_VARIANT), - VARIANT + " not a supported variant, skip.") + @unittest.skipUnless( + skipVariant(LINUX_VARIANT), VARIANT + " not a supported variant, skip." + ) def test_skx(self): self.checkVariant(self.VARIANT) class TestHSWVariant(TestNodeVariant): - """ Test avx2 Node Variants """ + """Test avx2 Node Variants""" VARIANT = "hsw" LINUX_VARIANT = "avx2" @@ -133,7 +136,8 @@ class TestHSWVariant(TestNodeVariant): def tearDownClass(cls): super(TestHSWVariant, cls).tearDownClass() - @unittest.skipUnless(skipVariant(LINUX_VARIANT), - VARIANT + " not a supported variant, skip.") + @unittest.skipUnless( + skipVariant(LINUX_VARIANT), VARIANT + " not a supported variant, skip." + ) def test_hsw(self): self.checkVariant(self.VARIANT) |