commit 22f839b37037420a42e35f7ecbedae0e745ef70a
author Maciej Żenczykowski <maze@google.com> Fri May 27 15:28:50 2022 -0700
committer Maciej Żenczykowski <maze@google.com> Mon May 30 12:47:34 2022 +0000
tree 4de45fce6c9f2f3065152dd146a045d832c7659a
parent 04a54a947eb00ba22a25c09bec3e8f92d6eb01da

net-test: improve test failure on vanilla kernels

Make it easier to test vanilla kernels lacking:
  commit b8a72fd7c4e9bbaa707db047c0890fc97ba81dad
  ANDROID: net: xfrm: make PF_KEY SHA256 use RFC-compliant truncation.

By explicitly mentioning the missing commit and failing in
a way that doesn't (due to lack of cleanup) fail other later tests.

We also take this opportunity to fix a few obvious bugs/typos
(duplicated asserts).

Test: TreeHugger, manually on vanilla 5.15
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ieb73e5e95e69f1cfeec697b769cb40cf5c7dd5ed

net/test/pf_key_test.py

diff --git a/net/test/pf_key_test.py b/net/test/pf_key_test.py
index 317ec7e..adf7bd7 100755
--- a/net/test/pf_key_test.py
+++ b/net/test/pf_key_test.py
@@ -80,20 +80,32 @@
     self.assertTrue(attrs6["XFRMA_ALG_AUTH"].name.startswith(sha256_name))
 
     self.assertEqual(256, attrs4["XFRMA_ALG_CRYPT"].key_len)
-    self.assertEqual(256, attrs4["XFRMA_ALG_CRYPT"].key_len)
+    self.assertEqual(256, attrs6["XFRMA_ALG_CRYPT"].key_len)
+    self.assertEqual(256, attrs4["XFRMA_ALG_AUTH"].key_len)
     self.assertEqual(256, attrs6["XFRMA_ALG_AUTH"].key_len)
-    self.assertEqual(256, attrs6["XFRMA_ALG_AUTH"].key_len)
-    self.assertEqual(256, attrs6["XFRMA_ALG_AUTH_TRUNC"].key_len)
+    self.assertEqual(256, attrs4["XFRMA_ALG_AUTH_TRUNC"].key_len)
     self.assertEqual(256, attrs6["XFRMA_ALG_AUTH_TRUNC"].key_len)
 
-    self.assertEqual(128, attrs4["XFRMA_ALG_AUTH_TRUNC"].trunc_len)
-    self.assertEqual(128, attrs4["XFRMA_ALG_AUTH_TRUNC"].trunc_len)
+    if attrs4["XFRMA_ALG_AUTH_TRUNC"].trunc_len == 96:
+        missing4 = True
+    else:
+        self.assertEqual(128, attrs4["XFRMA_ALG_AUTH_TRUNC"].trunc_len)
+        missing4 = False
+
+    if attrs6["XFRMA_ALG_AUTH_TRUNC"].trunc_len == 96:
+        missing6 = True
+    else:
+        self.assertEqual(128, attrs6["XFRMA_ALG_AUTH_TRUNC"].trunc_len)
+        missing6 = False
 
     self.pf_key.DelSa(src4, dst4, 0xdeadbeef, pf_key.SADB_TYPE_ESP)
     self.assertEqual(1, len(self.xfrm.DumpSaInfo()))
     self.pf_key.DelSa(src6, dst6, 0xbeefdead, pf_key.SADB_TYPE_ESP)
     self.assertEqual(0, len(self.xfrm.DumpSaInfo()))
 
+    if missing4 or missing6:
+        self.assertFalse("missing b8a72fd7c4e9 ANDROID: net: xfrm: make PF_KEY SHA256 use RFC-compliant truncation.")
+
 
 if __name__ == "__main__":
   unittest.main()