commit 232ab126cf65216f971d02426ac2b859f9a639b3
author Elie Kheirallah <khei@google.com> Mon Nov 14 17:15:34 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 14 17:15:34 2022 +0000
tree 265f76ea754f69f0d2e2cc491f39bbb27775e6f3
parent 67024de73d500432a6faf419b425e4dc9e6ef271
parent 3742f99a6c4de42dcb97bc1e4f56e1d3a4a42890

Merge "Fix test following crosvm merge"

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 f9de77e..a836559 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -465,7 +465,9 @@
 
         // check until microdroid is shut down
         CommandRunner android = new CommandRunner(getDevice());
-        android.runWithTimeout(15000, "logcat", "-m", "1", "-e", "'crosvm has exited normally'");
+        // TODO: improve crosvm exit check. b/258848245
+        android.runWithTimeout(15000, "logcat", "-m", "1", "-e",
+                              "'virtualizationservice::crosvm.*exited with status exit status: 0'");
         // Check that tombstone is received (from host logcat)
         String result =
                 runOnHost(