diff options
3 files changed, 7 insertions, 0 deletions
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 83e4a39cf4..680a9761a0 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 @@ public class CompOsDenialHostTest extends BaseHostJUnit4Test { OdsignTestUtils testUtils = new OdsignTestUtils(testInfo); CompOsTestUtils compOsTestUtils = new CompOsTestUtils(device); + compOsTestUtils.assumeNotOnCuttlefish(); compOsTestUtils.assumeCompOsPresent(); testUtils.installTestApex(); 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 134cff9f8f..5660ce9b8f 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 @@ public class CompOsSigningHostTest extends ActivationTest { OdsignTestUtils testUtils = new OdsignTestUtils(testInfo); CompOsTestUtils compOsTestUtils = new CompOsTestUtils(device); + compOsTestUtils.assumeNotOnCuttlefish(); compOsTestUtils.assumeCompOsPresent(); testInfo.properties().put(ORIGINAL_CHECKSUMS_KEY, 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 60d7642d16..71b68c090a 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 @@ public class CompOsTestUtils { 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); |