Merge "Disable tests that affected by test infra flakiness"

3 files changed, 23 insertions, 20 deletions

diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/ChildSessionStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/ChildSessionStateMachineTest.java
index a50f2f86..0e413eda 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/ChildSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/ChildSessionStateMachineTest.java
@@ -120,6 +120,7 @@ import com.android.server.IpSecService;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.ArgumentMatcher;
@@ -508,8 +509,8 @@ public final class ChildSessionStateMachineTest {
         }
     }
 
-    @Test
-    public void testCreateFirstChild() throws Exception {
+    @Ignore
+    public void disableTestCreateFirstChild() throws Exception {
         doReturn(mSpyCurrentChildSaRecord)
                 .when(mMockSaRecordHelper)
                 .makeChildSaRecord(any(), any(), any());
@@ -1089,8 +1090,8 @@ public final class ChildSessionStateMachineTest {
         verify(mMockChildSessionSmCallback, never()).scheduleRetryLocalRequest(any());
     }
 
-    @Test
-    public void testRekeyLocalCreateChildHandlesKeyCalculationFail() throws Exception {
+    @Ignore
+    public void disableTestRekeyLocalCreateChildHandlesKeyCalculationFail() throws Exception {
         // Throw exception when building ChildSaRecord
         when(mMockSaRecordHelper.makeChildSaRecord(any(), any(), any()))
                 .thenThrow(
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionStateMachineTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionStateMachineTest.java
index a7ab23bf..22e62ca5 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeSessionStateMachineTest.java
@@ -153,6 +153,7 @@ import com.android.internal.net.utils.Log;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.invocation.InvocationOnMock;
@@ -1238,8 +1239,8 @@ public final class IkeSessionStateMachineTest {
         verify(mMockDefaultNetwork).getByName(REMOTE_HOSTNAME);
     }
 
-    @Test
-    public void testCreateIkeLocalIkeInit() throws Exception {
+    @Ignore
+    public void disableTestCreateIkeLocalIkeInit() throws Exception {
         setupFirstIkeSa();
 
         // Send IKE INIT request
@@ -2992,8 +2993,8 @@ public final class IkeSessionStateMachineTest {
         verifyRetransmissionStopped();
     }
 
-    @Test
-    public void testRekeyIkeLocalDeleteHandlesRespWithParsingError() throws Exception {
+    @Ignore
+    public void disableTestRekeyIkeLocalDeleteHandlesRespWithParsingError() throws Exception {
         setupIdleStateMachine();
         mockCreateAndTransitionToRekeyDeleteLocal();
         resetMockIkeMessageHelper();
@@ -3142,8 +3143,8 @@ public final class IkeSessionStateMachineTest {
                         eq(mSpyRemoteInitIkeSaRecord.getLocalSpi()), eq(mIkeSessionStateMachine));
     }
 
-    @Test
-    public void testRekeyIkeRemoteCreateHandlesInvalidReq() throws Exception {
+    @Ignore
+    public void disableTestRekeyIkeRemoteCreateHandlesInvalidReq() throws Exception {
         setupIdleStateMachine();
 
         // Receive Rekey request
@@ -3154,8 +3155,8 @@ public final class IkeSessionStateMachineTest {
         verifyProcessRekeyReqFailure(ERROR_TYPE_NO_PROPOSAL_CHOSEN);
     }
 
-    @Test
-    public void testRekeyIkeRemoteCreateSaCreationFailure() throws Exception {
+    @Ignore
+    public void disableTestRekeyIkeRemoteCreateSaCreationFailure() throws Exception {
         // Throw error when building new IKE SA
         throwExceptionWhenMakeRekeyIkeSa(
                 new GeneralSecurityException("testRekeyIkeRemoteCreateSaCreationFailure"));
@@ -3278,8 +3279,8 @@ public final class IkeSessionStateMachineTest {
                 mIkeSessionStateMachine.getCurrentState() instanceof IkeSessionStateMachine.Idle);
     }
 
-    @Test
-    public void testSimulRekey() throws Exception {
+    @Ignore
+    public void disableTestSimulRekey() throws Exception {
         setupIdleStateMachine();
 
         // Prepare "rekeyed" SA
@@ -4127,8 +4128,8 @@ public final class IkeSessionStateMachineTest {
         verify(mMockChildSessionStateMachine, times(2)).rekeyChildSession();
     }
 
-    @Test
-    public void testTempFailureHandlerTimeout() throws Exception {
+    @Ignore
+    public void disableTestTempFailureHandlerTimeout() throws Exception {
         long currentTime = 0;
         int retryCnt = 0;
 
@@ -4187,8 +4188,8 @@ public final class IkeSessionStateMachineTest {
         verify(mMockChildSessionStateMachine, times(2)).rekeyChildSession();
     }
 
-    @Test
-    public void testIdleReceiveRequestWithFatalError() throws Exception {
+    @Ignore
+    public void disableTestIdleReceiveRequestWithFatalError() throws Exception {
         setupIdleStateMachine();
 
         // Mock receiving packet with syntax error
diff --git a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocketTest.java b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocketTest.java
index 8310e798..c7b0a64b 100644
--- a/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocketTest.java
+++ b/tests/iketests/src/java/com/android/internal/net/ipsec/ike/IkeUdpEncapSocketTest.java
@@ -57,6 +57,7 @@ import com.android.server.IpSecService;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
@@ -256,8 +257,8 @@ public final class IkeUdpEncapSocketTest {
         verify(mSpyDummyUdpEncapSocketTwo).close();
     }
 
-    @Test
-    public void testSendIkePacket() throws Exception {
+    @Ignore
+    public void disableTestSendIkePacket() throws Exception {
         if (Looper.myLooper() == null) Looper.prepare();
 
         // Send IKE packet