From 8dfc7a06cc142801fabd3d0a950ccca597bd15b7 Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Wed, 14 Jun 2023 19:35:52 +0900 Subject: [PATCH] Add uid to the failure log of testFirewallBlocking ConnectivityManagerTest#testFirewallBlockingXXX were flaky. One possibility of making this test flaky is that somehow the test was running with system uid. So this CL adds uid to the failure log. Test: m Bug: 276496378 Change-Id: Iae1a0fe2ee8311213091e852fb1be9233cc3db56 --- .../net/src/android/net/cts/ConnectivityManagerTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index ee2f6bb487..1411a3747a 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -3410,6 +3410,7 @@ public class ConnectivityManagerTest { private void checkFirewallBlocking(final DatagramSocket srcSock, final DatagramSocket dstSock, final boolean expectBlock, final int chain) throws Exception { + final int uid = Process.myUid(); final Random random = new Random(); final byte[] sendData = new byte[100]; random.nextBytes(sendData); @@ -3425,7 +3426,8 @@ public class ConnectivityManagerTest { fail("Expect not to be blocked by firewall but sending packet was blocked:" + " chain=" + chain + " chainEnabled=" + mCm.getFirewallChainEnabled(chain) - + " uidFirewallRule=" + mCm.getUidFirewallRule(chain, Process.myUid())); + + " uid=" + uid + + " uidFirewallRule=" + mCm.getUidFirewallRule(chain, uid)); } dstSock.receive(pkt); @@ -3435,7 +3437,8 @@ public class ConnectivityManagerTest { 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())); + + " uid=" + uid + + " uidFirewallRule=" + mCm.getUidFirewallRule(chain, uid)); } }