diff options
author | Yan Yan <evitayan@google.com> | 2021-04-02 20:33:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-02 20:33:34 +0000 |
commit | 0be81bc251e4f2cda50813b032437480ae5c5648 (patch) | |
tree | 7d8eb8f1424f5a2cc90e06779c6d49e21d5cb233 | |
parent | ba75e2913fd95f6e3aec85cfa4942fcc7e7d18df (diff) | |
parent | 26c9e1cc9e381098081cb3f92129b6aa8acb37e0 (diff) | |
download | tests-0be81bc251e4f2cda50813b032437480ae5c5648.tar.gz |
Ignore ICMPv6 packets in _ExpectEspPacketOn am: c3bc6d71b3 am: 983ae625e7 am: 26c9e1cc9e
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1662144
Change-Id: I94f7ab9eff0cccdff09099743e0d292212d3bc61
-rw-r--r-- | net/test/xfrm_base.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/net/test/xfrm_base.py b/net/test/xfrm_base.py index 03e15c4..e61322e 100644 --- a/net/test/xfrm_base.py +++ b/net/test/xfrm_base.py @@ -270,6 +270,13 @@ def DecryptPacketWithNull(packet): class XfrmBaseTest(multinetwork_base.MultiNetworkBaseTest): """Base test class for all XFRM-related testing.""" + def _isIcmpv6(self, payload): + if not isinstance(payload, scapy.IPv6): + return False + if payload.nh == IPPROTO_ICMPV6: + return True + return payload.nh == IPPROTO_HOPOPTS and payload.payload.nh == IPPROTO_ICMPV6 + def _ExpectEspPacketOn(self, netid, spi, seq, length, src_addr, dst_addr): """Read a packet from a netid and verify its properties. @@ -284,7 +291,11 @@ class XfrmBaseTest(multinetwork_base.MultiNetworkBaseTest): Returns: scapy.IP/IPv6: the read packet """ - packets = self.ReadAllPacketsOn(netid) + packets = [] + for packet in self.ReadAllPacketsOn(netid): + if not self._isIcmpv6(packet): + packets.append(packet) + self.assertEqual(1, len(packets)) packet = packets[0] if length is not None: |