Fix test following crosvm merge
runWithTimeout in isTombstoneGeneratedWithConfig was using a string
generated from crosvm to validate that the VM successfully stopped.
This string was recently deleted upstream crosvm and started causing the
test to fail. This changes removes the cross-project string dependency
until we implement a better solution.
Bug: 255594691
Bug: 258838677
Test: atest MicrodroidHostTestCases:com.android.microdroid.test.MicrodroidHostTests#testTombstonesAreGeneratedUponCrash
Change-Id: Ib6be1d04b4988437623fbd33c5a9ffd2cc0991b1
diff --git a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
index c9df624..7038885 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -459,7 +459,9 @@
Optional.of(NUM_VCPUS));
// 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(