diff --git a/tests/cts/hostside/Android.bp b/tests/cts/hostside/Android.bp index 891c2ddb0a..e55ba6345c 100644 --- a/tests/cts/hostside/Android.bp +++ b/tests/cts/hostside/Android.bp @@ -32,6 +32,7 @@ java_test_host { // Only compile source java files in this apk. srcs: ["src/**/*.java"], libs: [ + "net-tests-utils-host-device-common", "cts-tradefed", "tradefed", ], diff --git a/tests/cts/hostside/TEST_MAPPING b/tests/cts/hostside/TEST_MAPPING index 2cfd7af1ae..dc86fb198c 100644 --- a/tests/cts/hostside/TEST_MAPPING +++ b/tests/cts/hostside/TEST_MAPPING @@ -11,6 +11,20 @@ }, { "exclude-annotation": "android.platform.test.annotations.RequiresDevice" + }, + { + "exclude-annotation": "com.android.testutils.SkipPresubmit" + } + ] + } + ], + "postsubmit": [ + { + // Postsubmit on virtual devices to monitor flakiness of @SkipPresubmit methods + "name": "CtsHostsideNetworkTests", + "options": [ + { + "exclude-annotation": "androidx.test.filters.RequiresDevice" } ] } diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideVpnTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideVpnTests.java index 691ac90584..4f21af78a9 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideVpnTests.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideVpnTests.java @@ -18,6 +18,8 @@ package com.android.cts.net; import android.platform.test.annotations.RequiresDevice; +import com.android.testutils.SkipPresubmit; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -35,11 +37,13 @@ public class HostsideVpnTests extends HostsideNetworkTestCase { uninstallPackage(TEST_APP2_PKG, true); } + @SkipPresubmit(reason = "Out of SLO flakiness") @Test public void testChangeUnderlyingNetworks() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testChangeUnderlyingNetworks"); } + @SkipPresubmit(reason = "Out of SLO flakiness") @Test public void testDefault() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testDefault"); @@ -162,6 +166,7 @@ public class HostsideVpnTests extends HostsideNetworkTestCase { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testBlockIncomingPackets"); } + @SkipPresubmit(reason = "Out of SLO flakiness") @Test public void testSetVpnDefaultForUids() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".VpnTest", "testSetVpnDefaultForUids");