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 <[email protected]> --- ryu/tests/unit/lib/test_rpc.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/ryu/tests/unit/lib/test_rpc.py b/ryu/tests/unit/lib/test_rpc.py index cedab55..b0adf20 100644 --- a/ryu/tests/unit/lib/test_rpc.py +++ b/ryu/tests/unit/lib/test_rpc.py @@ -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) -- 2.7.4 ------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today. http://sdm.link/xeonphi _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
