diff --git a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java index 355b496829..d08f6e99c4 100644 --- a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java +++ b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java @@ -44,6 +44,11 @@ import android.system.OsConstants; import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; +import com.android.testutils.SkipPresubmit; + +import org.junit.Test; +import org.junit.runner.RunWith; + import java.io.FileDescriptor; import java.io.IOException; import java.net.DatagramPacket; @@ -52,10 +57,6 @@ import java.net.Inet6Address; import java.net.InetAddress; import java.util.Arrays; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - @RunWith(AndroidJUnit4.class) @AppModeFull(reason = "Socket cannot bind in instant app mode") public class IpSecManagerTest extends IpSecBaseTest { @@ -692,6 +693,7 @@ public class IpSecManagerTest extends IpSecBaseTest { } @Test + @SkipPresubmit(reason = "b/186608065 - kernel 5.10 regression in TrafficStats with ipsec") public void testAesCbcHmacMd5Tcp6() throws Exception { IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY); IpSecAlgorithm auth = new IpSecAlgorithm(IpSecAlgorithm.AUTH_HMAC_MD5, getKey(128), 96); @@ -724,6 +726,7 @@ public class IpSecManagerTest extends IpSecBaseTest { } @Test + @SkipPresubmit(reason = "b/186608065 - kernel 5.10 regression in TrafficStats with ipsec") public void testAesCbcHmacSha1Tcp6() throws Exception { IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY); IpSecAlgorithm auth = new IpSecAlgorithm(IpSecAlgorithm.AUTH_HMAC_SHA1, getKey(160), 96); @@ -756,6 +759,7 @@ public class IpSecManagerTest extends IpSecBaseTest { } @Test + @SkipPresubmit(reason = "b/186608065 - kernel 5.10 regression in TrafficStats with ipsec") public void testAesCbcHmacSha256Tcp6() throws Exception { IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY); IpSecAlgorithm auth = new IpSecAlgorithm(IpSecAlgorithm.AUTH_HMAC_SHA256, getKey(256), 128); @@ -788,6 +792,7 @@ public class IpSecManagerTest extends IpSecBaseTest { } @Test + @SkipPresubmit(reason = "b/186608065 - kernel 5.10 regression in TrafficStats with ipsec") public void testAesCbcHmacSha384Tcp6() throws Exception { IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY); IpSecAlgorithm auth = new IpSecAlgorithm(IpSecAlgorithm.AUTH_HMAC_SHA384, getKey(384), 192); @@ -820,6 +825,7 @@ public class IpSecManagerTest extends IpSecBaseTest { } @Test + @SkipPresubmit(reason = "b/186608065 - kernel 5.10 regression in TrafficStats with ipsec") public void testAesCbcHmacSha512Tcp6() throws Exception { IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY); IpSecAlgorithm auth = new IpSecAlgorithm(IpSecAlgorithm.AUTH_HMAC_SHA512, getKey(512), 256); @@ -852,6 +858,7 @@ public class IpSecManagerTest extends IpSecBaseTest { } @Test + @SkipPresubmit(reason = "b/186608065 - kernel 5.10 regression in TrafficStats with ipsec") public void testAesGcm64Tcp6() throws Exception { IpSecAlgorithm authCrypt = new IpSecAlgorithm(IpSecAlgorithm.AUTH_CRYPT_AES_GCM, AEAD_KEY, 64); @@ -884,6 +891,7 @@ public class IpSecManagerTest extends IpSecBaseTest { } @Test + @SkipPresubmit(reason = "b/186608065 - kernel 5.10 regression in TrafficStats with ipsec") public void testAesGcm96Tcp6() throws Exception { IpSecAlgorithm authCrypt = new IpSecAlgorithm(IpSecAlgorithm.AUTH_CRYPT_AES_GCM, AEAD_KEY, 96); @@ -916,6 +924,7 @@ public class IpSecManagerTest extends IpSecBaseTest { } @Test + @SkipPresubmit(reason = "b/186608065 - kernel 5.10 regression in TrafficStats with ipsec") public void testAesGcm128Tcp6() throws Exception { IpSecAlgorithm authCrypt = new IpSecAlgorithm(IpSecAlgorithm.AUTH_CRYPT_AES_GCM, AEAD_KEY, 128); @@ -1110,6 +1119,7 @@ public class IpSecManagerTest extends IpSecBaseTest { } @Test + @SkipPresubmit(reason = "b/186608065 - kernel 5.10 regression in TrafficStats with ipsec") public void testCryptTcp6() throws Exception { IpSecAlgorithm crypt = new IpSecAlgorithm(IpSecAlgorithm.CRYPT_AES_CBC, CRYPT_KEY); checkTransform(IPPROTO_TCP, IPV6_LOOPBACK, crypt, null, null, false, 1, false); @@ -1117,6 +1127,7 @@ public class IpSecManagerTest extends IpSecBaseTest { } @Test + @SkipPresubmit(reason = "b/186608065 - kernel 5.10 regression in TrafficStats with ipsec") public void testAuthTcp6() throws Exception { IpSecAlgorithm auth = new IpSecAlgorithm(IpSecAlgorithm.AUTH_HMAC_SHA256, getKey(256), 128); checkTransform(IPPROTO_TCP, IPV6_LOOPBACK, null, auth, null, false, 1, false);