From e4f4704b73725585dc33461bf47e2815994a6f1f Mon Sep 17 00:00:00 2001 From: IWASE Yusuke Date: Fri, 9 Oct 2015 16:51:27 +0900 Subject: tester: Use six.binary_type for binary data comparison Signed-off-by: IWASE Yusuke Signed-off-by: FUJITA Tomonori --- ryu/tests/switch/tester.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ryu/tests/switch/tester.py b/ryu/tests/switch/tester.py index 5182d45e..c01e8b93 100644 --- a/ryu/tests/switch/tester.py +++ b/ryu/tests/switch/tester.py @@ -953,7 +953,7 @@ class OfTester(app_manager.RyuApp): def _diff_packets(self, model_pkt, rcv_pkt): msg = [] for rcv_p in rcv_pkt.protocols: - if type(rcv_p) != str: + if not isinstance(rcv_p, six.binary_type): model_protocols = model_pkt.get_protocols(type(rcv_p)) if len(model_protocols) == 1: model_p = model_protocols[0] @@ -980,7 +980,7 @@ class OfTester(app_manager.RyuApp): else: model_p = '' for p in model_pkt.protocols: - if type(p) == str: + if isinstance(rcv_p, six.binary_type): model_p = p break if model_p != rcv_p: -- cgit v1.2.3