openstack/os-ken
Code Issues Proposed changes

python3: Make stringify test functional

Browse Source 
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:57 +09:00 committed by FUJITA Tomonori
parent 698cf43b03
commit 8fe50be72f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ryu/tests/unit/lib/test_stringify.py
View File

@ -15,6 +15,7 @@
# limitations under the License. # limitations under the License.
import base64 import base64
import six
import unittest import unittest
from nose.tools import eq_ from nose.tools import eq_
@ -40,10 +41,15 @@ class Test_stringify(unittest.TestCase):
pass pass
def test_jsondict(self): def test_jsondict(self):
if six.PY3:
def b64encode(s):
return base64.b64encode(s).decode('ascii')
else:
b64encode = base64.b64encode
j = {'C1': {'a': 'QUFB', 'c': 'Q0ND'}} j = {'C1': {'a': 'QUFB', 'c': 'Q0ND'}}
eq_(j['C1']['a'], base64.b64encode(b'AAA')) eq_(j['C1']['a'], b64encode(b'AAA'))
eq_(j['C1']['c'], base64.b64encode(b'CCC')) eq_(j['C1']['c'], b64encode(b'CCC'))
c = C1(a='AAA', c='CCC') c = C1(a=b'AAA', c=b'CCC')
c2 = C1.from_jsondict(j['C1']) c2 = C1.from_jsondict(j['C1'])
eq_(c.__class__, c2.__class__) eq_(c.__class__, c2.__class__)
eq_(c.__dict__, c2.__dict__) eq_(c.__dict__, c2.__dict__)