commit c2fba70be59c1a8dc35ce74f3b28c92899e12bbb
author Chalard Jean <jchalard@google.com> Fri Jun 30 13:05:26 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 30 13:05:26 2023 +0000
tree 7fac9c4dc4933e599c4b7510745fa6af3894ae58
parent a9af5824f33f02ed39efae9f9bd487d090547ab4
parent 4342567175e8eb27f9cb7507198ceadae5ad6205

Disable tests that depend on the prebuilt version in U am: 202630d6c2 am: 4342567175

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

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

tests/cts/net/src/android/net/cts/NetworkAgentTest.kt

diff --git a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
index 98ea224..5879065 100644
--- a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
+++ b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
@@ -130,6 +130,7 @@
 import kotlin.test.assertTrue
 import kotlin.test.fail
 import org.junit.After
+import org.junit.Assume.assumeFalse
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -1214,6 +1215,7 @@
 
     @Test
     fun testUnregisterAfterReplacement() {
+        assumeFalse(Build.isDebuggable()) // Disabled presubmit pending prebuilt update on U
         // Keeps an eye on all test networks.
         val matchAllCallback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS)
         registerNetworkCallback(makeTestNetworkRequest(), matchAllCallback)
@@ -1484,6 +1486,7 @@
 
     @Test
     fun testNativeNetworkCreation_PhysicalNetwork() {
+        assumeFalse(Build.isDebuggable()) // Disabled presubmit pending prebuilt update on U
         doTestNativeNetworkCreation(
                 expectCreatedImmediately = SHOULD_CREATE_NETWORKS_IMMEDIATELY,
                 intArrayOf(TRANSPORT_CELLULAR))