commit 4426a84111b0a7bc66aab995ceefb8036a5541fd
author Maciej Żenczykowski <maze@google.com> Sat Apr 23 12:33:32 2022 -0700
committer Maciej Żenczykowski <maze@google.com> Fri May 13 14:59:13 2022 +0000
tree 46914c46cd451ce867c7b6b4f222a8bb0c6cbbd3
parent fc938cf026bce0217aa5d1c7cc4db8337e6ee45a

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

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