diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-12-14 08:09:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-14 08:09:48 +0000 |
| commit | 8056a9bdfcaf8b8776eccbae3ec29560679e867e (patch) | |
| tree | db29d0aa9192605ed22f22c8a42ee95917dc21ef | |
| parent | 414cff342d09380340cd6164d82b7d9416bc15a1 (diff) | |
| parent | 7265a2cec99da06ccecb8740f7dd451efa18b757 (diff) | |
| download | extras-8056a9bdfcaf8b8776eccbae3ec29560679e867e.tar.gz | |
Merge "Deal with flowlabel randomization."
| -rw-r--r-- | tests/net_test/multinetwork_base.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/net_test/multinetwork_base.py b/tests/net_test/multinetwork_base.py index 2282bbab..c178bdd9 100644 --- a/tests/net_test/multinetwork_base.py +++ b/tests/net_test/multinetwork_base.py @@ -517,6 +517,12 @@ class MultiNetworkBaseTest(net_test.NetworkTest): actualip.flags &= 5 actualip.chksum = None # Change the header, recalculate the checksum. + # Blank out the flow label, since new kernels randomize it by default. + actualipv6 = actual.getlayer("IPv6") + expectedipv6 = expected.getlayer("IPv6") + if actualipv6 and expectedipv6: + actualipv6.fl = expectedipv6.fl + # Blank out UDP fields that we can't predict (e.g., the source port for # kernel-originated packets). actualudp = actual.getlayer("UDP") @@ -529,7 +535,6 @@ class MultiNetworkBaseTest(net_test.NetworkTest): # Since the TCP code below messes with options, recalculate the length. if actualip: actualip.len = None - actualipv6 = actual.getlayer("IPv6") if actualipv6: actualipv6.plen = None |