openstack
/
neutron-dynamic-routing
Code Issues Proposed changes

Merge "Use six.text_type instead of unicode"

This commit is contained in:
Jenkins 2016-07-19 15:34:01 +00:00 committed by Gerrit Code Review
parent 58e3e42894 24c9d87b68
commit 4a1181199c
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron_dynamic_routing/tests/unit/services/bgp/driver/ryu/test_driver.py
View File

@ -108,11 +108,7 @@ class TestRyuBgpDriver(base.BaseTestCase):
self.ryu_bgp_driver.add_bgp_speaker(FAKE_LOCAL_AS1)
self.assertEqual(1,
self.ryu_bgp_driver.cache.get_hosted_bgp_speakers_count())
# In Python3 a str is unicode
if six.PY3:
NEW_FAKE_PEER_PASSWORD = str(FAKE_PEER_PASSWORD)
else:
NEW_FAKE_PEER_PASSWORD = unicode(FAKE_PEER_PASSWORD)
NEW_FAKE_PEER_PASSWORD = six.text_type(FAKE_PEER_PASSWORD)
self.ryu_bgp_driver.add_bgp_peer(
FAKE_LOCAL_AS1,
FAKE_PEER_IP,