openstack/os-ken
Code Issues Proposed changes

test_lldp: stop abusing Packet.next()

Browse Source 
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
YAMAMOTO Takashi 2013-11-22 13:41:32 +09:00 committed by FUJITA Tomonori
parent afcdb5f123
commit e9ee8c90b5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ryu/tests/unit/packet/test_lldp.py
View File

@ -71,9 +71,10 @@ class TestLLDPMandatoryTLV(unittest.TestCase):
def test_parse(self):
buf = self.data
pkt = packet.Packet(buf)
i = iter(pkt)
eq_(type(pkt.next()), ethernet.ethernet)
eq_(type(pkt.next()), lldp.lldp)
eq_(type(i.next()), ethernet.ethernet)
eq_(type(i.next()), lldp.lldp)
def test_tlv(self):
tlv = lldp.ChassisID(subtype=lldp.ChassisID.SUB_MAC_ADDRESS,
@ -225,9 +226,10 @@ class TestLLDPOptionalTLV(unittest.TestCase):
def test_parse(self):
buf = self.data
pkt = packet.Packet(buf)
i = iter(pkt)
eq_(type(pkt.next()), ethernet.ethernet)
lldp_pkt = pkt.next()
eq_(type(i.next()), ethernet.ethernet)
lldp_pkt = i.next()
eq_(type(lldp_pkt), lldp.lldp)
tlvs = lldp_pkt.tlvs