commit 65d84b3b7d4e77d7b68e8ec14c6bb287e17fe1cc
author Victor Hsieh <victorhsieh@google.com> Wed Apr 26 10:31:10 2023 -0700
committer Victor Hsieh <victorhsieh@google.com> Thu Apr 27 15:16:33 2023 +0000
tree 920269583bf8a618b54bfbb67787385396aad57e
parent d6ce8df21644ec03e01f819b793edee0a7522d2c

odsign_e2e_tests: Skip CompOS tests on cuttlefish

See aosp/2527181 for rationale.

Bug: 279687054
Test: atest on cuttlefish, saw assumption failure
Change-Id: Iac30e718cc07d0c888d4972da940c04a48778fdf

test/odsign/test-src/com/android/tests/odsign/CompOsDenialHostTest.java

diff --git a/test/odsign/test-src/com/android/tests/odsign/CompOsDenialHostTest.java b/test/odsign/test-src/com/android/tests/odsign/CompOsDenialHostTest.java
index 83e4a39..680a976 100644
--- a/test/odsign/test-src/com/android/tests/odsign/CompOsDenialHostTest.java
+++ b/test/odsign/test-src/com/android/tests/odsign/CompOsDenialHostTest.java
@@ -56,6 +56,7 @@
         OdsignTestUtils testUtils = new OdsignTestUtils(testInfo);
         CompOsTestUtils compOsTestUtils = new CompOsTestUtils(device);
 
+        compOsTestUtils.assumeNotOnCuttlefish();
         compOsTestUtils.assumeCompOsPresent();
 
         testUtils.installTestApex();

test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java

diff --git a/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java b/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
index 134cff9..5660ce9 100644
--- a/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
+++ b/test/odsign/test-src/com/android/tests/odsign/CompOsSigningHostTest.java
@@ -54,6 +54,7 @@
         OdsignTestUtils testUtils = new OdsignTestUtils(testInfo);
         CompOsTestUtils compOsTestUtils = new CompOsTestUtils(device);
 
+        compOsTestUtils.assumeNotOnCuttlefish();
         compOsTestUtils.assumeCompOsPresent();
 
         testInfo.properties().put(ORIGINAL_CHECKSUMS_KEY,

test/odsign/test-src/com/android/tests/odsign/CompOsTestUtils.java

diff --git a/test/odsign/test-src/com/android/tests/odsign/CompOsTestUtils.java b/test/odsign/test-src/com/android/tests/odsign/CompOsTestUtils.java
index e0f4993..0825871 100644
--- a/test/odsign/test-src/com/android/tests/odsign/CompOsTestUtils.java
+++ b/test/odsign/test-src/com/android/tests/odsign/CompOsTestUtils.java
@@ -125,6 +125,11 @@
         assumeTrue(mDevice.doesFileExist("/apex/com.android.compos/"));
     }
 
+    public void assumeNotOnCuttlefish() throws Exception {
+        String product = mDevice.getProperty("ro.build.product");
+        assumeTrue(product != null && !product.startsWith("vsoc_"));
+    }
+
     private String assertCommandSucceeds(String command) throws DeviceNotAvailableException {
         CommandResult result = mDevice.executeShellV2Command(command);
         assertWithMessage(result.toString()).that(result.getExitCode()).isEqualTo(0);