commit 28f9526bf33bbf99038b68ab9fc4166b3d437dd0
author Lorenzo Colitti <lorenzo@google.com> Tue Jan 30 14:53:46 2018 +0900
committer Lorenzo Colitti <lorenzo@google.com> Wed Jan 31 11:03:28 2018 +0900
tree 66992a8964cf5cabc8bc217e6295a14e454af5f1
parent 2df998025630ef051e54c18603c06b328ce0f6b1

Make xfrm_test pass with newer versions of iproute.

Bug: 36510518
Test: testAddSa passes on device
Change-Id: I47abfed5fcb54360161416d502886d898d166b7b

net/test/xfrm_test.py

diff --git a/net/test/xfrm_test.py b/net/test/xfrm_test.py
index f42666c..66796c6 100755
--- a/net/test/xfrm_test.py
+++ b/net/test/xfrm_test.py
@@ -80,6 +80,10 @@
             xfrm_base._ENCRYPTION_KEY_256.encode("hex")))
 
     actual = subprocess.check_output("ip xfrm state".split())
+    # Newer versions of IP also show anti-replay context. Don't choke if it's
+    # missing.
+    actual = actual.replace(
+        "\tanti-replay context: seq 0x0, oseq 0x0, bitmap 0x00000000\n", "")
     try:
       self.assertMultiLineEqual(expected, actual)
     finally: