openstack
/
neutron
Code Issues Proposed changes

Merge "functional: Replace unicode() with six.u()"

This commit is contained in:
Jenkins 2017-06-28 02:40:00 +00:00 committed by Gerrit Code Review
parent 4723a11da9 b12e0f01fc
commit 9a72bfe389
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/tests/functional/agent/l3/test_dvr_router.py
View File

@ -1287,11 +1287,11 @@ class TestDvrRouter(framework.L3AgentTestFramework):
str(net_addr_2) + '/' +
str(fixed_ips_2[0]['prefixlen']))
expected_routes = [{'dev': fpr_device_name,
'cidr': unicode(route_cidr_1),
'cidr': six.u(route_cidr_1),
'via': str(rtr_2_fip.ip),
'table': 'main'},
{'dev': fpr_device_name,
'cidr': unicode(route_cidr_2),
'cidr': six.u(route_cidr_2),
'via': str(rtr_2_fip.ip),
'table': 'main'}]
# Comparing the static routes for both internal interfaces on the