commit 56e52574c78c4b2480bce3f1a9358c05c149584a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 12 23:26:48 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 12 23:26:48 2023 +0000
tree cbc2c6edd44f6cea7f1e05e2f25365a6644b436f
parent 6540d0f15c137d334e93905b58c938be666583aa
parent d756e7fd8d6b679b1cd561285c36df0068219ef9

Snap for 9929149 from d756e7fd8d6b679b1cd561285c36df0068219ef9 to tm-qpr3-release

Change-Id: If1dbee8f5e84e0bfd7a378959d8ec4494320ebc7

derive_sdk/derive_sdk_test.cpp

diff --git a/derive_sdk/derive_sdk_test.cpp b/derive_sdk/derive_sdk_test.cpp
index b04b5fd..ecd8033 100644
--- a/derive_sdk/derive_sdk_test.cpp
+++ b/derive_sdk/derive_sdk_test.cpp
@@ -102,6 +102,7 @@
 };
 
 TEST_F(DeriveSdkTest, CurrentSystemImageValue) {
+  GTEST_SKIP() << "Ignoring b/274987782";
   EXPECT_ALL(3);
 }
 

javatests/com/android/sdkext/extensions/SdkExtensionsHostTest.java

diff --git a/javatests/com/android/sdkext/extensions/SdkExtensionsHostTest.java b/javatests/com/android/sdkext/extensions/SdkExtensionsHostTest.java
index db513b6..8abab8c 100644
--- a/javatests/com/android/sdkext/extensions/SdkExtensionsHostTest.java
+++ b/javatests/com/android/sdkext/extensions/SdkExtensionsHostTest.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
+import org.junit.Ignore;
 
 import android.cts.install.lib.host.InstallUtilsHost;
 
@@ -91,11 +92,13 @@
     }
 
     @Test
+    @Ignore("b/274764792")
     public void testDefault() throws Exception {
         assertVersionDefault();
     }
 
     @Test
+    @Ignore("b/274764792")
     public void upgradeOneApexWithBump()  throws Exception {
         assertVersionDefault();
         mInstallUtils.installApexes(SDKEXTENSIONS_FILENAME);
@@ -109,6 +112,7 @@
     }
 
     @Test
+    @Ignore("b/274764792")
     public void upgradeOneApex() throws Exception {
         // Version 45 requires updated sdkext and media, so updating just media changes nothing.
         assertVersionDefault();
@@ -118,6 +122,7 @@
     }
 
     @Test
+    @Ignore("b/274764792")
     public void upgradeTwoApexes() throws Exception {
         // Updating sdkext and media bumps the version to 45.
         assertVersionDefault();