openstack
/
neutron
Code Issues Proposed changes

Fix wrong OS ENV type 

If we set environment for Neutron tests in tox.ini, we may get
type error like:
TypeError: %d format: a number is required, not str

os.environ.get method will get string, not integer. This patch
fix it.

Change-Id: Ie71302b8e33586082ae8334e6317e30d382e893a
This commit is contained in:
Dongcan Ye 2017-10-10 20:06:06 +08:00
parent 7c1e5d7188
commit 5907b1d924
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/tests/common/net_helpers.py
View File

@ -69,10 +69,13 @@ LB_DEVICE_NAME_MAX_LEN = 10
SS_SOURCE_PORT_PATTERN = re.compile(
r'^.*\s+\d+\s+.*:(?P<port>\d+)\s+[^\s]+:.*')
READ_TIMEOUT = os.environ.get('OS_TEST_READ_TIMEOUT', 5)
READ_TIMEOUT = int(
os.environ.get('OS_TEST_READ_TIMEOUT', 5))
CHILD_PROCESS_TIMEOUT = os.environ.get('OS_TEST_CHILD_PROCESS_TIMEOUT', 20)
CHILD_PROCESS_SLEEP = os.environ.get('OS_TEST_CHILD_PROCESS_SLEEP', 0.5)
CHILD_PROCESS_TIMEOUT = int(
os.environ.get('OS_TEST_CHILD_PROCESS_TIMEOUT', 20))
CHILD_PROCESS_SLEEP = float(
os.environ.get('OS_TEST_CHILD_PROCESS_SLEEP', 0.5))
TRANSPORT_PROTOCOLS = (n_const.PROTO_NAME_TCP, n_const.PROTO_NAME_UDP,
n_const.PROTO_NAME_SCTP)