openstack/os-ken
Code Issues Proposed changes

test_rpc: Use numbers.Integral instead of long type

Browse Source 
Currently, test_rpc.py uses long type for PyPy interpreter compatibility,
but log type is obsoleted in Python 3.
This patch fixes test_rpc.py to use numbers.Integral and makes its
implemetation more clean.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWASE Yusuke 2016-11-09 14:17:16 +09:00 committed by FUJITA Tomonori
parent 9f04612459
commit a45c180447
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ryu/tests/unit/lib/test_rpc.py
View File

@ -119,13 +119,7 @@ class Test_rpc(unittest.TestCase):
assert isinstance(obj, int)
result = c.call(b'resp', [obj])
assert result == obj
import sys
# note: on PyPy, result will be a long type value.
sv = getattr(sys, 'subversion', None)
if sv is not None and sv[0] == 'PyPy':
assert isinstance(result, long)
else:
assert isinstance(result, type(obj))
assert isinstance(result, numbers.Integral)
def test_0_call_int3(self):
c = rpc.Client(self._client_sock)
@ -133,16 +127,15 @@ class Test_rpc(unittest.TestCase):
assert isinstance(obj, int)
result = c.call(b'resp', [obj])
assert result == obj
assert isinstance(result, type(obj))
assert isinstance(result, numbers.Integral)
def test_0_call_long(self):
c = rpc.Client(self._client_sock)
obj = 0xffffffffffffffff # max value for msgpack
_long = int if six.PY3 else long
assert isinstance(obj, _long)
assert isinstance(obj, numbers.Integral)
result = c.call(b'resp', [obj])
assert result == obj
assert isinstance(result, type(obj))
assert isinstance(result, numbers.Integral)
def test_0_call_long2(self):
c = rpc.Client(self._client_sock)