commit 4625640fc9623561b3d35980abb8f9ffeab3f8fc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Mar 08 18:47:28 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 08 18:47:28 2024 +0000
tree a3ec96456cc570d2ea59a705e5b493dd29db7178
parent f4dce0a70ccecfd5fe19ee98e9d7a8af38ec650c
parent c78d8091d5ebd631f5e94cff8ee21833bfa9866d

Merge "Disable Secretkeeper usage for VM." into main

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 4f502ab..6dd3afe 100644
--- a/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
+++ b/tests/hostside/java/com/android/microdroid/test/MicrodroidHostTests.java
@@ -793,12 +793,11 @@
         assertWithMessage("Incorrect ABI list").that(abis).hasLength(1);
 
         // Check that no denials have happened so far
+        String logText =
+                getDevice().pullFileContents(CONSOLE_PATH) + getDevice().pullFileContents(LOG_PATH);
         assertWithMessage("Unexpected denials during VM boot")
-                .that(android.tryRun("egrep", "'avc:[[:space:]]{1,2}denied'", LOG_PATH))
-                .isNull();
-        assertWithMessage("Unexpected denials during VM boot")
-                .that(android.tryRun("egrep", "'avc:[[:space:]]{1,2}denied'", CONSOLE_PATH))
-                .isNull();
+                .that(logText)
+                .doesNotContainMatch("avc:\s+denied");
 
         assertThat(getDeviceNumCpus(microdroid)).isEqualTo(getDeviceNumCpus(android));