commit 197e3f6169ea4768e84fd5a47e233b5285c7b918
author Pierre-Clément Tosi <ptosi@google.com> Mon Oct 10 17:27:27 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 10 17:27:27 2022 +0000
tree 9ed058268dc3da073139ee39647fd01b9b5737c9
parent 5a838a0f47c38c71c3656f83090c70d46ef6f1ea
parent 77620034c0097f6b67f2329730aa1132173ab02b

Merge changes from topic "rust-pvmfw"

* changes:
  test: Ignore testBootFailsWhenProtectedVmStartsWithImagesSignedWithDifferentKey
  test: Ignore bootFailsWhenPvmFwDataIsCompromised

tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java

diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java
index 9dd2a15..a2deb19 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidTestCase.java
@@ -426,6 +426,7 @@
     }
 
     @Test
+    @Ignore("b/245081929")
     @CddTest(requirements = {"9.17/C-2-1", "9.17/C-2-2", "9.17/C-2-6"})
     public void testBootFailsWhenProtectedVmStartsWithImagesSignedWithDifferentKey()
             throws Exception {

tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java

diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index 3681348..d903a47 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -36,6 +36,7 @@
 import com.android.microdroid.testservice.ITestService;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -390,6 +391,7 @@
     }
 
     @Test
+    @Ignore("b/249723852")
     @CddTest(requirements = {
             "9.17/C-1-1",
             "9.17/C-2-7"