From eb6e44662ce9497c34fc5cbf6eaebcf9700098b4 Mon Sep 17 00:00:00 2001 From: Pierre LALET Date: Mon, 25 Dec 2017 11:38:22 +0100 Subject: [PATCH] Python 3: fix recently added tests --- scapy/contrib/ikev2.uts | 2 +- scapy/contrib/lldp.uts | 10 +++++----- test/regression.uts | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scapy/contrib/ikev2.uts b/scapy/contrib/ikev2.uts index 106e6fbc5..331bdcd59 100644 --- a/scapy/contrib/ikev2.uts +++ b/scapy/contrib/ikev2.uts @@ -83,7 +83,7 @@ assert isinstance(c, EncryptedTrafficSelector) = IKEv2_payload_Encrypted_Fragment, simple tests s = b"\x00\x00\x00\x08\x00\x01\x00\x01" -assert str(IKEv2_payload_Encrypted_Fragment()) == s +assert raw(IKEv2_payload_Encrypted_Fragment()) == s p = IKEv2_payload_Encrypted_Fragment(s) assert p.length == 8 and p.frag_number == 1 diff --git a/scapy/contrib/lldp.uts b/scapy/contrib/lldp.uts index 32326f9c1..19d6c0639 100644 --- a/scapy/contrib/lldp.uts +++ b/scapy/contrib/lldp.uts @@ -223,8 +223,8 @@ assert sys_capabilities.wlan_access_point_enabled == 0 assert sys_capabilities.mac_bridge_enabled == 0 assert sys_capabilities.repeater_enabled == 0 assert sys_capabilities.other_enabled == 0 -assert frm[LLDPDUManagementAddress].management_address == '1.2.3.4' -assert frm[LLDPDUSystemName].system_name == 'things will' -assert frm[LLDPDUManagementAddress].object_id == 'burn' -assert frm[LLDPDUSystemDescription].description == 'without tests.' -assert frm[LLDPDUPortDescription].description == 'always!' +assert frm[LLDPDUManagementAddress].management_address == b'1.2.3.4' +assert frm[LLDPDUSystemName].system_name == b'things will' +assert frm[LLDPDUManagementAddress].object_id == b'burn' +assert frm[LLDPDUSystemDescription].description == b'without tests.' +assert frm[LLDPDUPortDescription].description == b'always!' diff --git a/test/regression.uts b/test/regression.uts index 5201be95a..0d75b9cbf 100644 --- a/test/regression.uts +++ b/test/regression.uts @@ -9496,8 +9496,8 @@ assert parsed["RTPExtension"].header == [0x16373131,0x36363231,0x20003000] created = RTP(extension=True, payload_type="PCMA", sequence=0x1234, timestamp=12345678, sourcesync=0xabcdef01) created /= RTPExtension(header_id=0x4321, header=[0x11223344]) -assert str(created) == b'\x90\x08\x124\x00\xbcaN\xab\xcd\xef\x01C!\x00\x01\x11"3D', ' '.join(x.encode('hex') for x in str(created)) -parsed = RTP(str(created)) +assert raw(created) == b'\x90\x08\x124\x00\xbcaN\xab\xcd\xef\x01C!\x00\x01\x11"3D' +parsed = RTP(raw(created)) assert parsed.payload_type == 8 assert "RTPExtension" in parsed, parsed.show() assert parsed["RTPExtension"].header == [0x11223344] @@ -9505,7 +9505,7 @@ assert parsed["RTPExtension"].header == [0x11223344] = test RTP without extension created = RTP(extension=False, payload_type="DVI4", sequence=0x1234, timestamp=12345678, sourcesync=0xabcdef01) -assert str(created) == b'\x80\x11\x124\x00\xbcaN\xab\xcd\xef\x01', ' '.join(x.encode('hex') for x in str(created)) -parsed = RTP(str(created)) +assert raw(created) == b'\x80\x11\x124\x00\xbcaN\xab\xcd\xef\x01' +parsed = RTP(raw(created)) assert parsed.sourcesync == 0xabcdef01 assert "RTPExtension" not in parsed