commit 4379c8321dceea9eaf17a8e694e7ba66bc1b02bc
author Alice Wang <aliceywang@google.com> Mon Dec 05 15:50:20 2022 +0000
committer Alice Wang <aliceywang@google.com> Tue Dec 06 10:49:20 2022 +0000
tree a81b6024a6465b2b97b86cc2ca75fbfae69e55fc
parent 48de1258ce28bdaba984ed1fd77375ee31d32869

[pvmfw][test] Test the pvmfw success scenario with valid image

Bug: 256148034
Test: atest MicrodroidHostTests
Change-Id: Ie7681a8861823dbfd773597b948921e5842fa7ec

pvmfw/src/main.rs

diff --git a/pvmfw/src/main.rs b/pvmfw/src/main.rs
index cf7e90a..d453e26 100644
--- a/pvmfw/src/main.rs
+++ b/pvmfw/src/main.rs
@@ -55,6 +55,6 @@
         error!("Failed to verify the payload: {e}");
         RebootReason::PayloadVerificationError
     })?;
-    info!("Payload verified. Starting payload...");
+    info!("Starting payload...");
     Ok(())
 }

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

diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
index bf2d411..5ce8f60 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -408,27 +408,33 @@
 
     @Test
     @CddTest(requirements = {"9.17/C-2-1", "9.17/C-2-2", "9.17/C-2-6"})
-    public void protectedVmWithValidKernelImageRunsPvmfw() throws Exception {
+    public void protectedVmRunsPvmfw() throws Exception {
         // Arrange
         boolean protectedVm = true;
         assumeTrue(
                 "Skip if protected VMs are not supported",
                 getAndroidDevice().supportsMicrodroid(protectedVm));
-        File key = findTestFile("test.com.android.virt.pem");
+        final String configPath = "assets/vm_config_apex.json";
 
         // Act
-        // TODO(b/256148034): Do not resign kernel image
-        VmInfo vmInfo =
-                runMicrodroidWithResignedImages(key, /*keyOverrides=*/ Map.of(), protectedVm);
+        mMicrodroidDevice =
+                MicrodroidBuilder.fromDevicePath(getPathForPackage(PACKAGE_NAME), configPath)
+                        .debugLevel("full")
+                        .memoryMib(minMemorySize())
+                        .numCpus(NUM_VCPUS)
+                        .protectedVm(protectedVm)
+                        .build(getAndroidDevice());
 
         // Assert
-        vmInfo.mProcess.waitFor(5L, TimeUnit.SECONDS);
+        mMicrodroidDevice.waitForBootComplete(BOOT_COMPLETE_TIMEOUT);
         String consoleLog = getDevice().pullFileContents(CONSOLE_PATH);
-        assertWithMessage("pvmfw should start").that(consoleLog).contains("pVM firmware");
-        assertWithMessage("pvmfw should start payload")
+        assertWithMessage("Failed to verify that pvmfw started")
                 .that(consoleLog)
-                .contains("Payload verified. Starting payload...");
-        vmInfo.mProcess.destroy();
+                .contains("pVM firmware");
+        assertWithMessage("pvmfw failed to start kernel")
+                .that(consoleLog)
+                .contains("Starting payload...");
+        // TODO(b/260994818): Investigate the feasibility of checking DeathReason.
     }
 
     @Test