test: Fix issues with new version of pycodestyle (VPP-1232)

- Ignore warnings W504 (newline after binary operator) which otherwise
  occurs a significant number of times.
- Fix two instances of lines >79 chars.

Change-Id: I8cef56f8afc237187995e638e610c8c0554e2bb5
Signed-off-by: Chris Luke <chrisy@flirble.org>

diff --git a/test/Makefile b/test/Makefile
index cbeec79..88192e7 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -196,7 +196,7 @@ checkstyle: verify-python-path
        @virtualenv $(PYTHON_VENV_PATH) -p $(PYTHON_INTERP)
        @bash -c "source $(PYTHON_VENV_PATH)/bin/activate && pip install pycodestyle"
        @bash -c "source $(PYTHON_VENV_PATH)/bin/activate &&\
-               pycodestyle --show-source --ignore=E126,E241,E226,E305,E704,E741,E722 -v $(WS_ROOT)/test/*.py ||\
+               pycodestyle --show-source --ignore=W504,E126,E241,E226,E305,E704,E741,E722 -v $(WS_ROOT)/test/*.py ||\
                (echo \"*******************************************************************\" &&\
                 echo \"* Test framework PEP8 compliance check FAILED \" &&\
                 echo \"*******************************************************************\" &&\

diff --git a/test/test_acl_plugin.py b/test/test_acl_plugin.py
index 376c4d8..b2d9756 100644 (file)
--- a/test/test_acl_plugin.py
+++ b/test/test_acl_plugin.py
@@ -1093,7 +1093,8 @@ class TestACLplugin(VppTestCase):
         self.logger.info("ACLP_TEST_FINISH_0020")
 
     def test_0021_udp_deny_port_verify_fragment_deny(self):
-        """ deny single UDPv4/v6, permit ip any, verify non-initial fragment blocked
+        """ deny single UDPv4/v6, permit ip any, verify non-initial fragment
+        blocked
         """
         self.logger.info("ACLP_TEST_START_0021")
 

diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 4fdd94b..24483fe 100644 (file)
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -568,7 +568,8 @@ class VppPapiProvider(object):
                          'enable': enable})
 
     def bridge_flags(self, bd_id, is_set, feature_bitmap):
-        """Enable/disable required feature of the bridge domain with defined ID.
+        """Enable/disable required feature of the bridge domain with defined
+        ID.
 
         :param int bd_id: Bridge domain ID.
         :param int is_set: Set to 1 to enable, set to 0 to disable the feature.