Skip to content
Snippets Groups Projects
Unverified Commit d1aa6889 authored by Koen Zandberg's avatar Koen Zandberg Committed by GitHub
Browse files

Merge pull request #8255 from miri64/tests/fix/regression-fa64e933 

tests: fix tests/gnrc_netif for changes in #6895
parents 1ec87311 eb08a509
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tests/gnrc_netif/tests/01-run.py
+ 15
− 15
View file @ d1aa6889
...@@ -80,44 +80,44 @@ def testfunc(child): ...@@ -80,44 +80,44 @@ def testfunc(child):
child.expect("pktdump dumping Ethernet packet with empty payload") child.expect("pktdump dumping Ethernet packet with empty payload")
child.expect("PKTDUMP: data received:") child.expect("PKTDUMP: data received:")
child.expect(r"~~ SNIP 0 - size: 0 byte, type: NETTYPE_UNDEF \(0\)") child.expect(r"~~ SNIP 0 - size: 0 byte, type: NETTYPE_UNDEF \(0\)")
child.expect(r"00000000~~ SNIP 1 - size: 20 byte, type: NETTYPE_NETIF \(-1\)") child.expect(r"00000000~~ SNIP 1 - size: \d+ byte, type: NETTYPE_NETIF \(-1\)")
child.expect(r"if_pid: \d+ rssi: \d+ lqi: \d+") child.expect(r"if_pid: \d+ rssi: -?\d+ lqi: \d+")
child.expect("flags: 0x0") child.expect("flags: 0x0")
child.expect("src_l2addr: 3e:e6:b5:22:fd:0b") child.expect("src_l2addr: 3e:e6:b5:22:fd:0b")
child.expect("dst_l2addr: 3e:e6:b5:22:fd:0a") child.expect("dst_l2addr: 3e:e6:b5:22:fd:0a")
child.expect("~~ PKT - 2 snips, total size: 20 byte") child.expect("~~ PKT - 2 snips, total size: \d+ byte")
# test_netapi_recv__empty_ieee802154_payload # test_netapi_recv__empty_ieee802154_payload
child.expect(r"pktdump dumping IEEE 802\.15\.4 packet with empty payload") child.expect(r"pktdump dumping IEEE 802\.15\.4 packet with empty payload")
child.expect("PKTDUMP: data received:") child.expect("PKTDUMP: data received:")
child.expect(r"~~ SNIP 0 - size: 0 byte, type: NETTYPE_UNDEF \(0\)") child.expect(r"~~ SNIP 0 - size: 0 byte, type: NETTYPE_UNDEF \(0\)")
child.expect(r"00000000~~ SNIP 1 - size: 24 byte, type: NETTYPE_NETIF \(-1\)") child.expect(r"00000000~~ SNIP 1 - size: \d+ byte, type: NETTYPE_NETIF \(-1\)")
child.expect(r"if_pid: \d+ rssi: \d+ lqi: \d+") child.expect(r"if_pid: \d+ rssi: -?\d+ lqi: \d+")
child.expect("flags: 0x0") child.expect("flags: 0x0")
child.expect("src_l2addr: 3e:e6:b5:0f:19:22:fd:0b") child.expect("src_l2addr: 3e:e6:b5:0f:19:22:fd:0b")
child.expect("dst_l2addr: 3e:e6:b5:0f:19:22:fd:0a") child.expect("dst_l2addr: 3e:e6:b5:0f:19:22:fd:0a")
child.expect("~~ PKT - 2 snips, total size: 24 byte") child.expect("~~ PKT - 2 snips, total size: \d+ byte")
# test_netapi_recv__raw_ethernet_payload # test_netapi_recv__raw_ethernet_payload
child.expect("pktdump dumping Ethernet packet with payload 12 34 45 56") child.expect("pktdump dumping Ethernet packet with payload 12 34 45 56")
child.expect("PKTDUMP: data received:") child.expect("PKTDUMP: data received:")
child.expect(r"~~ SNIP 0 - size: 4 byte, type: NETTYPE_UNDEF \(0\)") child.expect(r"~~ SNIP 0 - size: 4 byte, type: NETTYPE_UNDEF \(0\)")
child.expect("00000000 12 34 45 56") child.expect("00000000 12 34 45 56")
child.expect(r"~~ SNIP 1 - size: 20 byte, type: NETTYPE_NETIF \(-1\)") child.expect(r"~~ SNIP 1 - size: \d+ byte, type: NETTYPE_NETIF \(-1\)")
child.expect(r"if_pid: \d+ rssi: \d+ lqi: \d+") child.expect(r"if_pid: \d+ rssi: -?\d+ lqi: \d+")
child.expect("flags: 0x0") child.expect("flags: 0x0")
child.expect("src_l2addr: 3e:e6:b5:22:fd:0b") child.expect("src_l2addr: 3e:e6:b5:22:fd:0b")
child.expect("dst_l2addr: 3e:e6:b5:22:fd:0a") child.expect("dst_l2addr: 3e:e6:b5:22:fd:0a")
child.expect("~~ PKT - 2 snips, total size: 24 byte") child.expect("~~ PKT - 2 snips, total size: \d+ byte")
# test_netapi_recv__raw_ieee802154_payload # test_netapi_recv__raw_ieee802154_payload
child.expect(r"pktdump dumping IEEE 802\.15\.4 packet with payload 12 34 45 56") child.expect(r"pktdump dumping IEEE 802\.15\.4 packet with payload 12 34 45 56")
child.expect("PKTDUMP: data received:") child.expect("PKTDUMP: data received:")
child.expect(r"~~ SNIP 0 - size: 4 byte, type: NETTYPE_UNDEF \(0\)") child.expect(r"~~ SNIP 0 - size: 4 byte, type: NETTYPE_UNDEF \(0\)")
child.expect("00000000 12 34 45 56") child.expect("00000000 12 34 45 56")
child.expect(r"~~ SNIP 1 - size: 24 byte, type: NETTYPE_NETIF \(-1\)") child.expect(r"~~ SNIP 1 - size: \d+ byte, type: NETTYPE_NETIF \(-1\)")
child.expect(r"if_pid: \d+ rssi: \d+ lqi: \d+") child.expect(r"if_pid: \d+ rssi: -?\d+ lqi: \d+")
child.expect("flags: 0x0") child.expect("flags: 0x0")
child.expect("src_l2addr: 3e:e6:b5:0f:19:22:fd:0b") child.expect("src_l2addr: 3e:e6:b5:0f:19:22:fd:0b")
child.expect("dst_l2addr: 3e:e6:b5:0f:19:22:fd:0a") child.expect("dst_l2addr: 3e:e6:b5:0f:19:22:fd:0a")
child.expect("~~ PKT - 2 snips, total size: 28 byte") child.expect("~~ PKT - 2 snips, total size: \d+ byte")
# test_netapi_recv__ipv6_ethernet_payload # test_netapi_recv__ipv6_ethernet_payload
child.expect("pktdump dumping IPv6 over Ethernet packet with payload 01") child.expect("pktdump dumping IPv6 over Ethernet packet with payload 01")
child.expect("PKTDUMP: data received:") child.expect("PKTDUMP: data received:")
...@@ -129,12 +129,12 @@ def testfunc(child): ...@@ -129,12 +129,12 @@ def testfunc(child):
child.expect("length: 1 next header: 59 hop limit: 64") child.expect("length: 1 next header: 59 hop limit: 64")
child.expect("source address: fe80::3fe6:b5ff:fe22:fd0a") child.expect("source address: fe80::3fe6:b5ff:fe22:fd0a")
child.expect("destination address: fe80::3fe6:b5ff:fe22:fd0b") child.expect("destination address: fe80::3fe6:b5ff:fe22:fd0b")
child.expect(r"~~ SNIP 1 - size: 20 byte, type: NETTYPE_NETIF \(-1\)") child.expect(r"~~ SNIP 1 - size: \d+ byte, type: NETTYPE_NETIF \(-1\)")
child.expect(r"if_pid: \d+ rssi: \d+ lqi: \d+") child.expect(r"if_pid: \d+ rssi: -?\d+ lqi: \d+")
child.expect("flags: 0x0") child.expect("flags: 0x0")
child.expect("src_l2addr: 3e:e6:b5:22:fd:0b") child.expect("src_l2addr: 3e:e6:b5:22:fd:0b")
child.expect("dst_l2addr: 3e:e6:b5:22:fd:0a") child.expect("dst_l2addr: 3e:e6:b5:22:fd:0a")
child.expect("~~ PKT - 2 snips, total size: 61 byte") child.expect("~~ PKT - 2 snips, total size: \d+ byte")
if __name__ == "__main__": if __name__ == "__main__":
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment