| commit | 2cd3762879b9bcb2a40015201ca2cd52b753d3e1 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 24 08:25:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 24 08:25:33 2020 +0000 |
| tree | 9a9aac2ceddfbf1e273ee7bdd3f26c36216c7eec | |
| parent | 30e195dae39d5dd388920ca61786405ee8ffd27d [diff] | |
| parent | 4feab037a55449f9f8b3d65b744598b9fffa42b2 [diff] |
Merge "Skip flaky CTS tests for presubmit" into rvc-dev am: a372d80c12 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11970057 Change-Id: Ib1852885513a3044bdc0cee05638719d2918d394
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java index a19ba64..34ca9a4 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityDiagnosticsManagerTest.java
@@ -80,6 +80,7 @@ import com.android.testutils.ArrayTrackRecord; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; import com.android.testutils.DevSdkIgnoreRunner; +import com.android.testutils.SkipPresubmit; import org.junit.After; import org.junit.Before; @@ -189,6 +190,7 @@ cb.assertNoCallback(); } + @SkipPresubmit(reason = "Flaky: b/159718782; add to presubmit after fixing") @Test public void testRegisterCallbackWithCarrierPrivileges() throws Exception { assumeTrue(mPackageManager.hasSystemFeature(FEATURE_TELEPHONY));
diff --git a/tests/cts/net/src/android/net/cts/DnsResolverTest.java b/tests/cts/net/src/android/net/cts/DnsResolverTest.java index e6f75c3..4acbbcf 100644 --- a/tests/cts/net/src/android/net/cts/DnsResolverTest.java +++ b/tests/cts/net/src/android/net/cts/DnsResolverTest.java
@@ -47,6 +47,7 @@ import android.util.Log; import com.android.net.module.util.DnsPacket; +import com.android.testutils.SkipPresubmit; import java.net.Inet4Address; import java.net.Inet6Address; @@ -585,6 +586,7 @@ doTestContinuousQueries(mExecutor); } + @SkipPresubmit(reason = "Flaky: b/159762682; add to presubmit after fixing") public void testContinuousQueriesInline() throws Exception { doTestContinuousQueries(mExecutorInline); }