From 739f3c7ae9b61f00803d877eb25f1633f5abfce9 Mon Sep 17 00:00:00 2001
From: chiachangwang <chiachangwang@google.com>
Date: Tue, 15 Aug 2023 09:22:06 +0000
Subject: [PATCH] Add tests in Ikev2VpnTest back to presubmit
Those tests are no longer flaky after fix being merged, so add
them back to presubmit.
Fix: 293239828
Test: atest CtsNetTestCases:android.net.cts.Ikev2VpnTest \
--rerun-until-failure 100
Change-Id: I3e5b0f8053404b8840e8ce67ea82344ab53ce421
---
tests/cts/net/src/android/net/cts/Ikev2VpnTest.java | 5 -----
1 file changed, 5 deletions(-)
diff --git a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
index 81834a941c..805dd65d87 100644
--- a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
+++ b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
@@ -71,8 +71,6 @@ import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import com.android.testutils.DevSdkIgnoreRunner;
import com.android.testutils.RecorderCallback.CallbackEntry;
-import com.android.testutils.SkipMainlinePresubmit;
-import com.android.testutils.SkipPresubmit;
import com.android.testutils.TestableNetworkCallback;
import org.bouncycastle.x509.X509V1CertificateGenerator;
@@ -642,7 +640,6 @@ public class Ikev2VpnTest {
}
@Test
- @SkipMainlinePresubmit(reason = "Out of SLO flakiness")
public void testStartStopVpnProfileV4() throws Exception {
doTestStartStopVpnProfile(false /* testIpv6Only */, false /* requiresValidation */,
false /* testSessionKey */, false /* testIkeTunConnParams */);
@@ -656,14 +653,12 @@ public class Ikev2VpnTest {
}
@Test
- @SkipMainlinePresubmit(reason = "Out of SLO flakiness")
public void testStartStopVpnProfileV6() throws Exception {
doTestStartStopVpnProfile(true /* testIpv6Only */, false /* requiresValidation */,
false /* testSessionKey */, false /* testIkeTunConnParams */);
}
@Test @IgnoreUpTo(SC_V2)
- @SkipPresubmit(reason = "Out of SLO flakiness")
public void testStartStopVpnProfileV6WithValidation() throws Exception {
assumeTrue(TestUtils.shouldTestTApis());
doTestStartStopVpnProfile(true /* testIpv6Only */, true /* requiresValidation */,
--
GitLab