LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add VpnTest back to presubmut

Browse Source 
These tests were disabled from presubmit because of flaky test.
It's no longer flaky now, so add these tests back to presubmit.

Bug: 293233390
Test: atest FrameworksNetTests
Change-Id: I7f1f36385d2ca6ed210e1d9b7399b6509fd26519
This commit is contained in:
chiachangwang
2023-08-07 08:47:34 +00:00
parent 50f07be9c2
commit 1a72396be6
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/java/com/android/server/connectivity/VpnTest.java
View File

@@ -182,7 +182,6 @@ import com.android.server.IpSecService;
import com.android.server.VpnTestBase; import com.android.server.VpnTestBase;
import com.android.server.vcn.util.PersistableBundleUtils; import com.android.server.vcn.util.PersistableBundleUtils;
import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.SkipPresubmit;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
@@ -1712,7 +1711,6 @@ public class VpnTest extends VpnTestBase {
errorCode); errorCode);
} }
@SkipPresubmit(reason = "Out of SLO flakiness")
@Test @Test
public void testStartPlatformVpnFailedWithRecoverableError() throws Exception { public void testStartPlatformVpnFailedWithRecoverableError() throws Exception {
final IkeProtocolException exception = mock(IkeProtocolException.class); final IkeProtocolException exception = mock(IkeProtocolException.class);
@@ -1722,7 +1720,6 @@ public class VpnTest extends VpnTestBase {
VpnManager.CATEGORY_EVENT_IKE_ERROR, VpnManager.ERROR_CLASS_RECOVERABLE, errorCode); VpnManager.CATEGORY_EVENT_IKE_ERROR, VpnManager.ERROR_CLASS_RECOVERABLE, errorCode);
} }
@SkipPresubmit(reason = "Out of SLO flakiness")
@Test @Test
public void testStartPlatformVpnFailedWithUnknownHostException() throws Exception { public void testStartPlatformVpnFailedWithUnknownHostException() throws Exception {
final IkeNonProtocolException exception = mock(IkeNonProtocolException.class); final IkeNonProtocolException exception = mock(IkeNonProtocolException.class);
@@ -1734,7 +1731,6 @@ public class VpnTest extends VpnTestBase {
errorCode); errorCode);
} }
@SkipPresubmit(reason = "Out of SLO flakiness")
@Test @Test
public void testStartPlatformVpnFailedWithIkeTimeoutException() throws Exception { public void testStartPlatformVpnFailedWithIkeTimeoutException() throws Exception {
final IkeNonProtocolException exception = mock(IkeNonProtocolException.class); final IkeNonProtocolException exception = mock(IkeNonProtocolException.class);
@@ -1756,7 +1752,6 @@ public class VpnTest extends VpnTestBase {
VpnManager.ERROR_CODE_NETWORK_LOST); VpnManager.ERROR_CODE_NETWORK_LOST);
} }
@SkipPresubmit(reason = "Out of SLO flakiness")
@Test @Test
public void testStartPlatformVpnFailedWithIOException() throws Exception { public void testStartPlatformVpnFailedWithIOException() throws Exception {
final IkeNonProtocolException exception = mock(IkeNonProtocolException.class); final IkeNonProtocolException exception = mock(IkeNonProtocolException.class);
@@ -2389,7 +2384,6 @@ public class VpnTest extends VpnTestBase {
true /* areLongLivedTcpConnectionsExpensive */); true /* areLongLivedTcpConnectionsExpensive */);
} }
@SkipPresubmit(reason = "Out of SLO flakiness")
@Test @Test
public void testPreferredIpProtocolFromCarrierConfig_v4UDP() throws Exception { public void testPreferredIpProtocolFromCarrierConfig_v4UDP() throws Exception {
doTestReadCarrierConfig(createTestCellNc(), doTestReadCarrierConfig(createTestCellNc(),
@@ -2402,7 +2396,6 @@ public class VpnTest extends VpnTestBase {
false /* areLongLivedTcpConnectionsExpensive */); false /* areLongLivedTcpConnectionsExpensive */);
} }
@SkipPresubmit(reason = "Out of SLO flakiness")
@Test @Test
public void testPreferredIpProtocolFromCarrierConfig_v6ESP() throws Exception { public void testPreferredIpProtocolFromCarrierConfig_v6ESP() throws Exception {
doTestReadCarrierConfig(createTestCellNc(), doTestReadCarrierConfig(createTestCellNc(),
@@ -2415,7 +2408,6 @@ public class VpnTest extends VpnTestBase {
false /* areLongLivedTcpConnectionsExpensive */); false /* areLongLivedTcpConnectionsExpensive */);
} }
@SkipPresubmit(reason = "Out of SLO flakiness")
@Test @Test
public void testPreferredIpProtocolFromCarrierConfig_v6UDP() throws Exception { public void testPreferredIpProtocolFromCarrierConfig_v6UDP() throws Exception {
doTestReadCarrierConfig(createTestCellNc(), doTestReadCarrierConfig(createTestCellNc(),