ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: support python 3.8

Browse Source 
Make test framework python3 version independence.

Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I1ef1eb77b6c1f422ebc4dad0818f87c8e587b34b
This commit is contained in:
Ole Troan
2020-02-04 13:28:13 +01:00
committed by Paul Vinciguerra
parent dc90c719bc
commit 6e6ad64a4c
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/Makefile
View File

@ -93,7 +93,7 @@ VENV_RUN_DIR:=$(VENV_PATH)/run
endif endif
ifeq ($(PYTHON),) ifeq ($(PYTHON),)
PYTHON_INTERP=python3.6 PYTHON_INTERP=python3
else else
PYTHON_INTERP=$(PYTHON) PYTHON_INTERP=$(PYTHON)
endif endif
@ -102,7 +102,7 @@ PYTHON_VERSION=$(shell $(PYTHON_INTERP) -c 'import sys; print(sys.version_info.m
PIP_VERSION=19.1.1 PIP_VERSION=19.1.1
PIP_TOOLS_VERSION=3.8.0 # Keep in sync with requirements.txt PIP_TOOLS_VERSION=3.8.0 # Keep in sync with requirements.txt
PYTHON_DEPENDS=requirements-$(PYTHON_VERSION).txt PYTHON_DEPENDS=requirements-$(PYTHON_VERSION).txt
SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/$(PYTHON_INTERP) -name site-packages) SCAPY_SOURCE=$(shell find $(VENV_PATH)/lib/python* -name site-packages)
BUILD_COV_DIR=$(TEST_BR)/coverage BUILD_COV_DIR=$(TEST_BR)/coverage
PIP_TOOLS_INSTALL_DONE=$(VENV_RUN_DIR)/pip-tools-install-$(PYTHON_VERSION).done PIP_TOOLS_INSTALL_DONE=$(VENV_RUN_DIR)/pip-tools-install-$(PYTHON_VERSION).done

3
test/framework.py
View File

@ -446,8 +446,7 @@ class VppTestCase(unittest.TestCase):
try: try:
cls.vpp = subprocess.Popen(cmdline, cls.vpp = subprocess.Popen(cmdline,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE)
bufsize=1)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
cls.logger.critical("Subprocess returned with non-0 return code: (" cls.logger.critical("Subprocess returned with non-0 return code: ("
"%s)", e.returncode) "%s)", e.returncode)

2
test/test_ip6.py
View File

@ -1278,7 +1278,7 @@ class TestIPv6RDControlPlane(TestIPv6ND):
while (n_tries): while (n_tries):
fib = self.vapi.ip_route_dump(0, True) fib = self.vapi.ip_route_dump(0, True)
default_routes = self.get_default_routes(fib) default_routes = self.get_default_routes(fib)
if 0 is len(default_routes): if 0 == len(default_routes):
return True return True
n_tries = n_tries - 1 n_tries = n_tries - 1
self.sleep(s_time) self.sleep(s_time)

6
test/vpp_ip_route.py
View File

@ -87,7 +87,7 @@ def ip_to_dpo_proto(addr):
def address_proto(ip_addr): def address_proto(ip_addr):
if ip_addr.ip_addr.version is 4: if ip_addr.ip_addr.version == 4:
return FibPathProto.FIB_PATH_NH_PROTO_IP4 return FibPathProto.FIB_PATH_NH_PROTO_IP4
else: else:
return FibPathProto.FIB_PATH_NH_PROTO_IP6 return FibPathProto.FIB_PATH_NH_PROTO_IP6
@ -96,7 +96,7 @@ def address_proto(ip_addr):
def find_route(test, addr, len, table_id=0): def find_route(test, addr, len, table_id=0):
prefix = mk_network(addr, len) prefix = mk_network(addr, len)
if 4 is prefix.version: if 4 == prefix.version:
routes = test.vapi.ip_route_dump(table_id, False) routes = test.vapi.ip_route_dump(table_id, False)
else: else:
routes = test.vapi.ip_route_dump(table_id, True) routes = test.vapi.ip_route_dump(table_id, True)
@ -131,7 +131,7 @@ def find_mroute(test, grp_addr, src_addr, grp_addr_len,
text_type(grp_addr), text_type(grp_addr),
grp_addr_len) grp_addr_len)
if 4 is ip_mprefix.version: if 4 == ip_mprefix.version:
routes = test.vapi.ip_mroute_dump(table_id, False) routes = test.vapi.ip_mroute_dump(table_id, False)
else: else:
routes = test.vapi.ip_mroute_dump(table_id, True) routes = test.vapi.ip_mroute_dump(table_id, True)