From 4426a84111b0a7bc66aab995ceefb8036a5541fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Sat, 23 Apr 2022 12:33:32 -0700 Subject: [PATCH] fix BpfMapTest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to account for close() becoming a no-op Bug: 230880517 Test: TreeHugger, atest com.android.networkstack.tethering.BpfMapTest Signed-off-by: Maciej Żenczykowski Change-Id: I69f25ff168c1cf0f13434dd1d842ed81a6a03f2f --- .../com/android/networkstack/tethering/BpfMapTest.java | 9 --------- 1 file changed, 9 deletions(-) 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 75c2ad15fb..68c1c57ef6 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 @@ public final class BpfMapTest { 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