aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorChris Luke <chrisy@flirble.org>2018-04-10 15:19:54 -0400
committerChris Luke <chris_luke@comcast.com>2018-04-10 19:21:59 +0000
commitd042194b4bb0512a81924068013ed4e48f021a2b (patch)
treeeed9c7753257af4af9676612fed3020b1cf9c201 /test
parente3ae09f8a317747249518afa952dbd36287b5e9a (diff)
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>
Diffstat (limited to 'test')
-rw-r--r--test/Makefile2
-rw-r--r--test/test_acl_plugin.py3
-rw-r--r--test/vpp_papi_provider.py3
3 files changed, 5 insertions, 3 deletions
diff --git a/test/Makefile b/test/Makefile
index cbeec79fa34..88192e7b474 100644
--- 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 376c4d81b87..b2d97565d56 100644
--- 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 4fdd94ba351..24483fe82b8 100644
--- 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.
2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ }
# Copyright (c) 2016 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

bin_PROGRAMS += g2

g2_SOURCES =					\
  tools/g2/clib.c				\
  tools/g2/cpel.c				\
  tools/g2/cpel.h				\
  tools/g2/events.c				\
  tools/g2/g2.h					\
  tools/g2/main.c				\
  tools/g2/menu1.c				\
  tools/g2/pointsel.c				\
  tools/g2/props.c				\
  tools/g2/props.h				\
  tools/g2/g2version.c				\
  tools/g2/view1.c

g2_LDADD = $(g2_LIBS) libvppinfra.la -lpthread -lm

# vi:syntax=automake