openstack
/
os-ken
Code Issues Proposed changes

tests: stop comparing text addresses 

on OS X, ntop produces strings like '3ffe:507::1:200:86ff:fe05:80da'
while others (NetBSD, Linux) produce '3ffe:507:0:1:200:86ff:fe05:80da'.

RFC 5952 4.2.2. says OS X behaviour is incorrect. (MUST NOT)
for longer term, it's probably better to workaround this in addrconv module.

Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
This commit is contained in:
YAMAMOTO Takashi 2013-08-01 16:00:17 +09:00 committed by FUJITA Tomonori
parent 1f330f9e19
commit f7219a77df
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ryu/tests/unit/packet/test_arp.py
View File

@ -108,10 +108,10 @@ class Test_arp(unittest.TestCase):
eq_(res[2], self.hlen)
eq_(res[3], self.plen)
eq_(res[4], self.opcode)
eq_(addrconv.mac.bin_to_text(res[5]), self.src_mac)
eq_(addrconv.ipv4.bin_to_text(res[6]), self.src_ip)
eq_(addrconv.mac.bin_to_text(res[7]), self.dst_mac)
eq_(addrconv.ipv4.bin_to_text(res[8]), self.dst_ip)
eq_(res[5], addrconv.mac.text_to_bin(self.src_mac))
eq_(res[6], addrconv.ipv4.text_to_bin(self.src_ip))
eq_(res[7], addrconv.mac.text_to_bin(self.dst_mac))
eq_(res[8], addrconv.ipv4.text_to_bin(self.dst_ip))
def _build_arp(self, vlan_enabled):
if vlan_enabled is True:

4
ryu/tests/unit/packet/test_ethernet.py
View File

@ -79,8 +79,8 @@ class Test_ethernet(unittest.TestCase):
fmt = ethernet._PACK_STR
res = struct.unpack(fmt, buf)
eq_(addrconv.mac.bin_to_text(res[0]), self.dst)
eq_(addrconv.mac.bin_to_text(res[1]), self.src)
eq_(res[0], addrconv.mac.text_to_bin(self.dst))
eq_(res[1], addrconv.mac.text_to_bin(self.src))
eq_(res[2], self.ethertype)
@raises(Exception)

9
ryu/tests/unit/packet/test_icmpv6.py
View File

@ -203,7 +203,8 @@ class Test_icmpv6_neighbor_solict(unittest.TestCase):
eq_(msg.code, self.code)
eq_(msg.csum, self.csum)
eq_(msg.data.res >> 29, self.res)
eq_(msg.data.dst, self.dst)
eq_(addrconv.ipv6.text_to_bin(msg.data.dst),
addrconv.ipv6.text_to_bin(self.dst))
eq_(n, None)
if data:
nd = msg.data
@ -234,7 +235,7 @@ class Test_icmpv6_neighbor_solict(unittest.TestCase):
eq_(code, self.code)
eq_(csum, nd_csum)
eq_(res >> 29, self.res)
eq_(addrconv.ipv6.bin_to_text(dst), self.dst)
eq_(dst, addrconv.ipv6.text_to_bin(self.dst))
eq_(data, '')
def test_serialize_with_data(self):
@ -257,10 +258,10 @@ class Test_icmpv6_neighbor_solict(unittest.TestCase):
eq_(code, self.code)
eq_(csum, nd_csum)
eq_(res >> 29, self.res)
eq_(addrconv.ipv6.bin_to_text(dst), self.dst)
eq_(dst, addrconv.ipv6.text_to_bin(self.dst))
eq_(nd_type, self.nd_type)
eq_(nd_length, self.nd_length)
eq_(addrconv.mac.bin_to_text(nd_hw_src), self.nd_hw_src)
eq_(nd_hw_src, addrconv.mac.text_to_bin(self.nd_hw_src))
class Test_icmpv6_neighbor_advert(Test_icmpv6_neighbor_solict):

4
ryu/tests/unit/packet/test_ipv4.py
View File

@ -118,8 +118,8 @@ class Test_ipv4(unittest.TestCase):
eq_(res[4], self.flg_off)
eq_(res[5], self.ttl)
eq_(res[6], self.proto)
eq_(addrconv.ipv4.bin_to_text(res[8]), self.src)
eq_(addrconv.ipv4.bin_to_text(res[9]), self.dst)
eq_(res[8], addrconv.ipv4.text_to_bin(self.src))
eq_(res[9], addrconv.ipv4.text_to_bin(self.dst))
eq_(option, self.option)
# checksum

4
ryu/tests/unit/packet/test_slow.py
View File

@ -423,7 +423,7 @@ class Test_lacp(unittest.TestCase):
eq_(act_res[0], self.actor_tag)
eq_(act_res[1], self.actor_length)
eq_(act_res[2], self.actor_system_priority)
eq_(addrconv.mac.bin_to_text(act_res[3]), self.actor_system)
eq_(act_res[3], addrconv.mac.text_to_bin(self.actor_system))
eq_(act_res[4], self.actor_key)
eq_(act_res[5], self.actor_port_priority)
eq_(act_res[6], self.actor_port)
@ -432,7 +432,7 @@ class Test_lacp(unittest.TestCase):
eq_(prt_res[0], self.partner_tag)
eq_(prt_res[1], self.partner_length)
eq_(prt_res[2], self.partner_system_priority)
eq_(addrconv.mac.bin_to_text(prt_res[3]), self.partner_system)
eq_(prt_res[3], addrconv.mac.text_to_bin(self.partner_system))
eq_(prt_res[4], self.partner_key)
eq_(prt_res[5], self.partner_port_priority)
eq_(prt_res[6], self.partner_port)

6
ryu/tests/unit/packet/test_vrrp.py
View File

@ -116,7 +116,7 @@ class Test_vrrpv2(unittest.TestCase):
eq_(res[4], vrrp.VRRP_AUTH_NO_AUTH)
eq_(res[5], max_adver_int)
# res[6] is checksum
eq_(addrconv.ipv4.bin_to_text(res[7]), ip_address)
eq_(res[7], addrconv.ipv4.text_to_bin(ip_address))
eq_(res[8], 0)
eq_(res[9], 0)
eq_(len(buf), pack_len)
@ -258,7 +258,7 @@ class Test_vrrpv3_ipv4(unittest.TestCase):
eq_(res[3], len(ip_addresses))
eq_(res[4], max_adver_int)
# res[5] is checksum
eq_(addrconv.ipv4.bin_to_text(res[6]), ip_address)
eq_(res[6], addrconv.ipv4.text_to_bin(ip_address))
eq_(len(buf), pack_len)
print(res)
@ -403,7 +403,7 @@ class Test_vrrpv3_ipv6(unittest.TestCase):
eq_(res[3], len(ip_addresses))
eq_(res[4], max_adver_int)
# res[5] is checksum
eq_(addrconv.ipv6.bin_to_text(res[6]), ip_address)
eq_(res[6], addrconv.ipv6.text_to_bin(ip_address))
eq_(len(buf), pack_len)
print(res)