commit 947cdba89df92beaa85d9020eb2f67b234835d91
author Motomu Utsumi <motomuman@google.com> Wed Apr 19 04:04:46 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 19 04:04:46 2023 +0000
tree 559868592dd2f7a821f41cff33ec1a2e3c5fe486
parent 6ada3ea94fd3b288c959376c13b7ccb4b9bb47ac
parent e74c7b6936eaa35f23a109a4e66135fa67763ce7

Merge "Move fail in testFirewallBlocking" am: e74c7b6936

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2542990

Change-Id: I4c9fbc0d5e7de08b49b933ff54adc4975f1c9260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 6e06eb5..9d234d3 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -3396,15 +3396,15 @@
                     + " uidFirewallRule=" + mCm.getUidFirewallRule(chain, Process.myUid()));
         }
 
+        dstSock.receive(pkt);
+        assertArrayEquals(sendData, pkt.getData());
+
         if (expectBlock) {
             fail("Expect to be blocked by firewall but sending packet was not blocked:"
                     + " chain=" + chain
                     + " chainEnabled=" + mCm.getFirewallChainEnabled(chain)
                     + " uidFirewallRule=" + mCm.getUidFirewallRule(chain, Process.myUid()));
         }
-
-        dstSock.receive(pkt);
-        assertArrayEquals(sendData, pkt.getData());
     }
 
     private static final boolean EXPECT_PASS = false;