diff options
| author | IWAMOTO Toshihiro <iwamoto@valinux.co.jp> | 2015-06-30 17:01:53 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-07-01 10:13:22 +0900 |
| commit | 464f56070d2f7a70e9c7be18cd08a246caf63a48 (patch) | |
| tree | fb8947ddefaf874ffc808383107dc687488d63ed | |
| parent | 7984bf50356cdace2e63522bcc5f678418a5f03f (diff) | |
python3: Use 'str' not b'str' for user test data
These "user" test data are similar to ones that are initialized from
JSON. So it makes more sense to define them as str not binary_type.
Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/tests/unit/ofproto/test_oxm.py | 4 | ||||
| -rw-r--r-- | ryu/tests/unit/ofproto/test_oxs.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ryu/tests/unit/ofproto/test_oxm.py b/ryu/tests/unit/ofproto/test_oxm.py index 448edf55..ffb762fc 100644 --- a/ryu/tests/unit/ofproto/test_oxm.py +++ b/ryu/tests/unit/ofproto/test_oxm.py @@ -171,7 +171,7 @@ class Test_OXM(unittest.TestCase): self._test(user, on_wire, 10) def test_basic_unknown_nomask(self): - user = ('field_100', b'aG9nZWhvZ2U=') + user = ('field_100', 'aG9nZWhvZ2U=') on_wire = ( b'\x00\x00\xc8\x08' b'hogehoge' @@ -179,7 +179,7 @@ class Test_OXM(unittest.TestCase): self._test(user, on_wire, 4) def test_basic_unknown_mask(self): - user = ('field_100', (b'aG9nZWhvZ2U=', b'ZnVnYWZ1Z2E=')) + user = ('field_100', ('aG9nZWhvZ2U=', 'ZnVnYWZ1Z2E=')) on_wire = ( b'\x00\x00\xc9\x10' b'hogehoge' diff --git a/ryu/tests/unit/ofproto/test_oxs.py b/ryu/tests/unit/ofproto/test_oxs.py index 53bd13b0..289731f0 100644 --- a/ryu/tests/unit/ofproto/test_oxs.py +++ b/ryu/tests/unit/ofproto/test_oxs.py @@ -108,7 +108,7 @@ class Test_OXS(unittest.TestCase): self._test(user, on_wire, 4) def test_basic_unknown(self): - user = ('field_100', b'aG9nZWhvZ2U=') + user = ('field_100', 'aG9nZWhvZ2U=') on_wire = ( b'\x00\x00\xc8\x08' b'hogehoge' |