diff options
Diffstat (limited to 'ryu/tests/unit')
-rw-r--r-- | ryu/tests/unit/ofproto/test_parser_compat.py | 2 | ||||
-rw-r--r-- | ryu/tests/unit/ofproto/test_parser_v12.py | 1 | ||||
-rw-r--r-- | ryu/tests/unit/packet/test_cfm.py | 4 | ||||
-rw-r--r-- | ryu/tests/unit/packet/test_icmpv6.py | 12 | ||||
-rw-r--r-- | ryu/tests/unit/packet/test_igmp.py | 4 | ||||
-rw-r--r-- | ryu/tests/unit/packet/test_ipv6.py | 4 | ||||
-rw-r--r-- | ryu/tests/unit/packet/test_ospf.py | 1 | ||||
-rw-r--r-- | ryu/tests/unit/packet/test_packet.py | 24 | ||||
-rw-r--r-- | ryu/tests/unit/packet/test_slow.py | 1 |
9 files changed, 30 insertions, 23 deletions
diff --git a/ryu/tests/unit/ofproto/test_parser_compat.py b/ryu/tests/unit/ofproto/test_parser_compat.py index 08be7583..f94c8194 100644 --- a/ryu/tests/unit/ofproto/test_parser_compat.py +++ b/ryu/tests/unit/ofproto/test_parser_compat.py @@ -58,7 +58,7 @@ class Test_Parser_Compat(unittest.TestCase): old_eth_src = addrconv.mac.text_to_bin(eth_src) old_ipv4_src = unpack('!I', addrconv.ipv4.text_to_bin(ipv4_src))[0] old_ipv6_src = list(unpack('!8H', - addrconv.ipv6.text_to_bin(ipv6_src))) + addrconv.ipv6.text_to_bin(ipv6_src))) def check(o): check_old(o) diff --git a/ryu/tests/unit/ofproto/test_parser_v12.py b/ryu/tests/unit/ofproto/test_parser_v12.py index d0abdbcd..73b034b2 100644 --- a/ryu/tests/unit/ofproto/test_parser_v12.py +++ b/ryu/tests/unit/ofproto/test_parser_v12.py @@ -6392,6 +6392,7 @@ class TestOFPQueueGetConfigReply(unittest.TestCase): class TestOFPBarrierRequest(unittest.TestCase): """ Test case for ofproto_v1_2_parser.OFPBarrierRequest """ + def test_serialize(self): c = OFPBarrierRequest(_Datapath) c.serialize() diff --git a/ryu/tests/unit/packet/test_cfm.py b/ryu/tests/unit/packet/test_cfm.py index fb0749d7..8b56e2df 100644 --- a/ryu/tests/unit/packet/test_cfm.py +++ b/ryu/tests/unit/packet/test_cfm.py @@ -307,8 +307,8 @@ class Test_cfm(unittest.TestCase): def test_to_string(self): cfm_values = {'op': self.message} _cfm_str = ','.join(['%s=%s' % (k, cfm_values[k]) - for k, v in inspect.getmembers(self.ins) - if k in cfm_values]) + for k, v in inspect.getmembers(self.ins) + if k in cfm_values]) cfm_str = '%s(%s)' % (cfm.cfm.__name__, _cfm_str) eq_(str(self.ins), cfm_str) eq_(repr(self.ins), cfm_str) diff --git a/ryu/tests/unit/packet/test_icmpv6.py b/ryu/tests/unit/packet/test_icmpv6.py index 414eee20..3965b087 100644 --- a/ryu/tests/unit/packet/test_icmpv6.py +++ b/ryu/tests/unit/packet/test_icmpv6.py @@ -1048,8 +1048,8 @@ class Test_icmpv6_membership_query(unittest.TestCase): mld_values = {'maxresp': self.maxresp, 'address': self.address} _mld_str = ','.join(['%s=%s' % (k, repr(mld_values[k])) - for k, v in inspect.getmembers(ml) - if k in mld_values]) + for k, v in inspect.getmembers(ml) + if k in mld_values]) mld_str = '%s(%s)' % (icmpv6.mld.__name__, _mld_str) icmp_values = {'type_': repr(self.type_), @@ -1309,8 +1309,8 @@ class Test_mldv2_query(unittest.TestCase): 'num': self.num, 'srcs': self.srcs} _mld_str = ','.join(['%s=%s' % (k, repr(mld_values[k])) - for k, v in inspect.getmembers(self.mld) - if k in mld_values]) + for k, v in inspect.getmembers(self.mld) + if k in mld_values]) mld_str = '%s(%s)' % (icmpv6.mldv2_query.__name__, _mld_str) icmp_values = {'type_': repr(self.type_), @@ -1578,8 +1578,8 @@ class Test_mldv2_report(unittest.TestCase): mld_values = {'record_num': self.record_num, 'records': self.records} _mld_str = ','.join(['%s=%s' % (k, repr(mld_values[k])) - for k, v in inspect.getmembers(self.mld) - if k in mld_values]) + for k, v in inspect.getmembers(self.mld) + if k in mld_values]) mld_str = '%s(%s)' % (icmpv6.mldv2_report.__name__, _mld_str) icmp_values = {'type_': repr(self.type_), diff --git a/ryu/tests/unit/packet/test_igmp.py b/ryu/tests/unit/packet/test_igmp.py index 9813450d..a29ddafe 100644 --- a/ryu/tests/unit/packet/test_igmp.py +++ b/ryu/tests/unit/packet/test_igmp.py @@ -43,6 +43,7 @@ LOG = logging.getLogger(__name__) class Test_igmp(unittest.TestCase): """ Test case for Internet Group Management Protocol """ + def setUp(self): self.msgtype = IGMP_TYPE_QUERY self.maxresp = 100 @@ -170,6 +171,7 @@ class Test_igmp(unittest.TestCase): class Test_igmpv3_query(unittest.TestCase): """ Test case for Internet Group Management Protocol v3 Membership Query Message""" + def setUp(self): self.msgtype = IGMP_TYPE_QUERY self.maxresp = 100 @@ -440,6 +442,7 @@ class Test_igmpv3_query(unittest.TestCase): class Test_igmpv3_report(unittest.TestCase): """ Test case for Internet Group Management Protocol v3 Membership Report Message""" + def setUp(self): self.msgtype = IGMP_TYPE_REPORT_V3 self.csum = 0 @@ -705,6 +708,7 @@ class Test_igmpv3_report(unittest.TestCase): class Test_igmpv3_report_group(unittest.TestCase): """Test case for Group Records of Internet Group Management Protocol v3 Membership Report Message""" + def setUp(self): self.type_ = MODE_IS_INCLUDE self.aux_len = 0 diff --git a/ryu/tests/unit/packet/test_ipv6.py b/ryu/tests/unit/packet/test_ipv6.py index e62ba042..ac648dfa 100644 --- a/ryu/tests/unit/packet/test_ipv6.py +++ b/ryu/tests/unit/packet/test_ipv6.py @@ -760,7 +760,7 @@ class Test_routing(unittest.TestCase): "2001:db8:dead::3"] # calculate pad self.pad = (8 - ((len(self.adrs) - 1) * (16 - self.cmpi) + - (16 - self.cmpe) % 8)) % 8 + (16 - self.cmpe) % 8)) % 8 # create buf self.form = '!BBBBBB2x16s16s16s' self.buf = struct.pack(self.form, self.nxt, self.size, @@ -818,7 +818,7 @@ class Test_routing_type3(unittest.TestCase): "2001:db8:dead::3"] # calculate pad self.pad = (8 - ((len(self.adrs) - 1) * (16 - self.cmpi) + - (16 - self.cmpe) % 8)) % 8 + (16 - self.cmpe) % 8)) % 8 self.routing = ipv6.routing_type3( self.nxt, self.size, self.type_, self.seg, self.cmpi, diff --git a/ryu/tests/unit/packet/test_ospf.py b/ryu/tests/unit/packet/test_ospf.py index df57b8de..d0f8bc37 100644 --- a/ryu/tests/unit/packet/test_ospf.py +++ b/ryu/tests/unit/packet/test_ospf.py @@ -23,6 +23,7 @@ from ryu.lib.packet import ospf class Test_ospf(unittest.TestCase): """ Test case for ryu.lib.packet.ospf """ + def setUp(self): pass diff --git a/ryu/tests/unit/packet/test_packet.py b/ryu/tests/unit/packet/test_packet.py index 80d22143..ef212815 100644 --- a/ryu/tests/unit/packet/test_packet.py +++ b/ryu/tests/unit/packet/test_packet.py @@ -254,8 +254,8 @@ class TestPacket(unittest.TestCase): 'vid': 3, 'ethertype': ether.ETH_TYPE_ARP} _vlan_str = ','.join(['%s=%s' % (k, repr(vlan_values[k])) - for k, v in inspect.getmembers(p_vlan) - if k in vlan_values]) + for k, v in inspect.getmembers(p_vlan) + if k in vlan_values]) vlan_str = '%s(%s)' % (vlan.vlan.__name__, _vlan_str) arp_values = {'hwtype': 1, @@ -709,7 +709,7 @@ class TestPacket(unittest.TestCase): 'payload_id': 0, 'payload_data': self.payload} _data_str = ','.join(['%s=%s' % (k, repr(data_values[k])) - for k in sorted(data_values.keys())]) + for k in sorted(data_values.keys())]) data_str = '[%s(%s)]' % (sctp.chunk_data.__name__, _data_str) sctp_values = {'src_port': 1, @@ -718,8 +718,8 @@ class TestPacket(unittest.TestCase): 'csum': repr(p_sctp.csum), 'chunks': data_str} _sctp_str = ','.join(['%s=%s' % (k, sctp_values[k]) - for k, _ in inspect.getmembers(p_sctp) - if k in sctp_values]) + for k, _ in inspect.getmembers(p_sctp) + if k in sctp_values]) sctp_str = '%s(%s)' % (sctp.sctp.__name__, _sctp_str) pkt_str = '%s, %s, %s' % (eth_str, ipv4_str, sctp_str) @@ -1245,7 +1245,7 @@ class TestPacket(unittest.TestCase): 'payload_id': 0, 'payload_data': self.payload} _data_str = ','.join(['%s=%s' % (k, repr(data_values[k])) - for k in sorted(data_values.keys())]) + for k in sorted(data_values.keys())]) data_str = '[%s(%s)]' % (sctp.chunk_data.__name__, _data_str) sctp_values = {'src_port': 1, @@ -1254,8 +1254,8 @@ class TestPacket(unittest.TestCase): 'csum': repr(p_sctp.csum), 'chunks': data_str} _sctp_str = ','.join(['%s=%s' % (k, sctp_values[k]) - for k, _ in inspect.getmembers(p_sctp) - if k in sctp_values]) + for k, _ in inspect.getmembers(p_sctp) + if k in sctp_values]) sctp_str = '%s(%s)' % (sctp.sctp.__name__, _sctp_str) pkt_str = '%s, %s, %s' % (eth_str, ipv6_str, sctp_str) @@ -1496,8 +1496,8 @@ class TestPacket(unittest.TestCase): 'pf_bit': 0, 'modifier_function2': 0} _ctrl_str = ','.join(['%s=%s' % (k, repr(ctrl_values[k])) - for k, v in inspect.getmembers(p_llc.control) - if k in ctrl_values]) + for k, v in inspect.getmembers(p_llc.control) + if k in ctrl_values]) ctrl_str = '%s(%s)' % (llc.ControlFormatU.__name__, _ctrl_str) llc_values = {'dsap_addr': repr(llc.SAP_BPDU), @@ -1524,8 +1524,8 @@ class TestPacket(unittest.TestCase): 'hello_time': float(2), 'forward_delay': float(15)} _bpdu_str = ','.join(['%s=%s' % (k, repr(bpdu_values[k])) - for k, v in inspect.getmembers(p_bpdu) - if k in bpdu_values]) + for k, v in inspect.getmembers(p_bpdu) + if k in bpdu_values]) bpdu_str = '%s(%s)' % (bpdu.ConfigurationBPDUs.__name__, _bpdu_str) pkt_str = '%s, %s, %s' % (eth_str, llc_str, bpdu_str) diff --git a/ryu/tests/unit/packet/test_slow.py b/ryu/tests/unit/packet/test_slow.py index 3ce9d450..c3f6c4b0 100644 --- a/ryu/tests/unit/packet/test_slow.py +++ b/ryu/tests/unit/packet/test_slow.py @@ -36,6 +36,7 @@ LOG = logging.getLogger(__name__) class Test_slow(unittest.TestCase): """ Test case for Slow Protocol """ + def setUp(self): self.subtype = SLOW_SUBTYPE_LACP self.version = lacp.LACP_VERSION_NUMBER |