2015-06-30 17:12 GMT+09:00 IWAMOTO Toshihiro <[email protected]>:
> At Tue, 30 Jun 2015 17:01:53 +0900,
> IWAMOTO Toshihiro wrote:
> >
> > 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.
>
> This partially reverts the previous commit of test_oxm.py.
> Kobayashi-san, are you ok with this change?
>
Sure =)
>
> > Signed-off-by: IWAMOTO Toshihiro <[email protected]>
> > ---
> > ryu/tests/unit/ofproto/test_oxm.py | 4 ++--
> > 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 448edf5..ffb762f 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 53bd13b..289731f 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'
> > --
> > 2.1.4
> >
>
--
Satoshi KOBAYASHI <[email protected]>
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
