openstack/os-ken
Code Issues Proposed changes

python3: Restore original str()s where six.binary_type shouldn't be used

Browse Source 
This partially reverts 227b8fd984.
These tests are testing __str__ method and shouldn't have been changed.

Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWAMOTO Toshihiro 2015-06-30 17:01:52 +09:00 committed by FUJITA Tomonori
parent 093776af17
commit 7984bf5035
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ryu/tests/unit/ofproto/test_parser_v13.py
View File

@ -94,7 +94,7 @@ class TestOFPMatch(unittest.TestCase):
match2 = match.from_jsondict(jsondict["OFPMatch"])
buf2 = bytearray()
match2.serialize(buf2, 0)
eq_(six.binary_type(match), six.binary_type(match2))
eq_(str(match), str(match2))
eq_(buf, buf2)
# set_vlan_vid
@ -139,7 +139,7 @@ class TestOFPMatch(unittest.TestCase):
match2 = match.from_jsondict(jsondict["OFPMatch"])
buf2 = bytearray()
match2.serialize(buf2, 0)
eq_(six.binary_type(match), six.binary_type(match2))
eq_(str(match), str(match2))
eq_(buf, buf2)
def test_set_vlan_vid_mid(self):