Merge "Skip presubmit for flaky tests in NetworkStackIntegrationTests due to Out of SLO" into main am: 2792a9a1cd

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

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

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 3869fc9..46ade58 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,7 +7,12 @@
       "name": "NetworkStackNextTests"
     },
     {
-      "name": "NetworkStackIntegrationTests"
+      "name": "NetworkStackIntegrationTests",
+      "options": [
+        {
+          "exclude-annotation": "com.android.testutils.SkipPresubmit"
+        }
+      ]
     },
     {
       "name": "NetworkStackRootTests"
@@ -32,6 +37,11 @@
       "name": "NetworkStackRootTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk]"
     }
   ],
+  "postsubmit": [
+    {
+      "name": "NetworkStackIntegrationTests"
+    }
+  ],
   "imports": [
     {
       "path": "packages/modules/Connectivity"

tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java

diff --git a/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java b/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java
index 8880d08..246d0d4 100644
--- a/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java
+++ b/tests/integration/common/android/net/ip/IpClientIntegrationTestCommon.java
@@ -218,6 +218,7 @@
 import com.android.testutils.DevSdkIgnoreRule.IgnoreAfter;
 import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
 import com.android.testutils.HandlerUtils;
+import com.android.testutils.SkipPresubmit;
 import com.android.testutils.TapPacketReader;
 import com.android.testutils.TestableNetworkAgent;
 import com.android.testutils.TestableNetworkCallback;
@@ -4888,8 +4889,9 @@
         assertTrue(packet instanceof Dhcp6RebindPacket);
     }
 
-    @Test
     @SignatureRequiredTest(reason = "Need to mock the DHCP6 renew/rebind alarms")
+    @SkipPresubmit(reason = "Out of SLO flakiness")
+    @Test
     public void testDhcp6Pd_prefixMismatchOnRenew() throws Exception {
         prepareDhcp6PdRenewTest();
 

tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt

diff --git a/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt b/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
index dcc0b1f..0f860a8 100644
--- a/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
+++ b/tests/integration/signature/android/net/NetworkStatsIntegrationTest.kt
@@ -34,6 +34,7 @@
 import com.android.testutils.DevSdkIgnoreRunner
 import com.android.testutils.PacketBridge
 import com.android.testutils.RecorderCallback.CallbackEntry.LinkPropertiesChanged
+import com.android.testutils.SkipPresubmit
 import com.android.testutils.TestDnsServer
 import com.android.testutils.TestHttpServer
 import com.android.testutils.TestableNetworkCallback
@@ -178,6 +179,7 @@
      * While the packets are being forwarded to the external interface, the servers will see
      * the packets originated from the mocked v6 address, and destined to a local v6 address.
      */
+    @SkipPresubmit(reason = "Out of SLO flakiness")
     @Test
     fun test464XlatTcpStats() {
         // Wait for 464Xlat to be ready.