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
This commit is contained in:
committed by
Chiachang Wang
parent
2238dc2ce3
commit
739f3c7ae9
@@ -71,8 +71,6 @@ import com.android.testutils.DevSdkIgnoreRule;
|
|||||||
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
|
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
|
||||||
import com.android.testutils.DevSdkIgnoreRunner;
|
import com.android.testutils.DevSdkIgnoreRunner;
|
||||||
import com.android.testutils.RecorderCallback.CallbackEntry;
|
import com.android.testutils.RecorderCallback.CallbackEntry;
|
||||||
import com.android.testutils.SkipMainlinePresubmit;
|
|
||||||
import com.android.testutils.SkipPresubmit;
|
|
||||||
import com.android.testutils.TestableNetworkCallback;
|
import com.android.testutils.TestableNetworkCallback;
|
||||||
|
|
||||||
import org.bouncycastle.x509.X509V1CertificateGenerator;
|
import org.bouncycastle.x509.X509V1CertificateGenerator;
|
||||||
@@ -642,7 +640,6 @@ public class Ikev2VpnTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SkipMainlinePresubmit(reason = "Out of SLO flakiness")
|
|
||||||
public void testStartStopVpnProfileV4() throws Exception {
|
public void testStartStopVpnProfileV4() throws Exception {
|
||||||
doTestStartStopVpnProfile(false /* testIpv6Only */, false /* requiresValidation */,
|
doTestStartStopVpnProfile(false /* testIpv6Only */, false /* requiresValidation */,
|
||||||
false /* testSessionKey */, false /* testIkeTunConnParams */);
|
false /* testSessionKey */, false /* testIkeTunConnParams */);
|
||||||
@@ -656,14 +653,12 @@ public class Ikev2VpnTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SkipMainlinePresubmit(reason = "Out of SLO flakiness")
|
|
||||||
public void testStartStopVpnProfileV6() throws Exception {
|
public void testStartStopVpnProfileV6() throws Exception {
|
||||||
doTestStartStopVpnProfile(true /* testIpv6Only */, false /* requiresValidation */,
|
doTestStartStopVpnProfile(true /* testIpv6Only */, false /* requiresValidation */,
|
||||||
false /* testSessionKey */, false /* testIkeTunConnParams */);
|
false /* testSessionKey */, false /* testIkeTunConnParams */);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test @IgnoreUpTo(SC_V2)
|
@Test @IgnoreUpTo(SC_V2)
|
||||||
@SkipPresubmit(reason = "Out of SLO flakiness")
|
|
||||||
public void testStartStopVpnProfileV6WithValidation() throws Exception {
|
public void testStartStopVpnProfileV6WithValidation() throws Exception {
|
||||||
assumeTrue(TestUtils.shouldTestTApis());
|
assumeTrue(TestUtils.shouldTestTApis());
|
||||||
doTestStartStopVpnProfile(true /* testIpv6Only */, true /* requiresValidation */,
|
doTestStartStopVpnProfile(true /* testIpv6Only */, true /* requiresValidation */,
|
||||||
|
|||||||
Reference in New Issue
Block a user