commit 19b6bcd73349ca87d1d6e70a44bba9d10d02e8bd
author Maciej Żenczykowski <maze@google.com> Sat Apr 23 12:33:32 2022 -0700
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Fri May 20 22:45:19 2022 +0000
tree b23c58891447bd99b12d20145dd3e97322c2866f
parent ca55de9512a983a1e9a39537e1368fd63ee63b42

fix BpfMapTest

to account for close() becoming a no-op

Bug: 230880517
Test: TreeHugger, atest com.android.networkstack.tethering.BpfMapTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I69f25ff168c1cf0f13434dd1d842ed81a6a03f2f
(cherry picked from commit 4426a84111b0a7bc66aab995ceefb8036a5541fd)
Merged-In: I69f25ff168c1cf0f13434dd1d842ed81a6a03f2f

Tethering/tests/privileged/src/com/android/networkstack/tethering/BpfMapTest.java

diff --git a/Tethering/tests/privileged/src/com/android/networkstack/tethering/BpfMapTest.java b/Tethering/tests/privileged/src/com/android/networkstack/tethering/BpfMapTest.java
index 75c2ad1..68c1c57 100644
--- a/Tethering/tests/privileged/src/com/android/networkstack/tethering/BpfMapTest.java
+++ b/Tethering/tests/privileged/src/com/android/networkstack/tethering/BpfMapTest.java
@@ -352,15 +352,6 @@
         assertFalse(mTestMap.isEmpty());
         mTestMap.clear();
         assertTrue(mTestMap.isEmpty());
-
-        // Clearing an already-closed map throws.
-        mTestMap.close();
-        try {
-            mTestMap.clear();
-            fail("clearing already-closed map should throw");
-        } catch (IllegalStateException expected) {
-            // ParcelFileDescriptor.getFd throws IllegalStateException: Already closed.
-        }
     }
 
     @Test