| commit | 0f4263c8fff8d311793662a8f946ea5e7d8c797f | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue May 03 05:52:52 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 03 05:52:52 2022 +0000 |
| tree | 27c0fb814f98beef091ae50442dbe603194bb3af | |
| parent | b11b47c13854a1fd3f51dd1f078a94451c962fbf [diff] | |
| parent | a726fe42ecdc78edae64764a0ef57344322b03a9 [diff] |
Merge "Don't run testTombstonesAreBeingForwarded on user builds" into tm-dev am: 4b758af21b am: a726fe42ec Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/18118302 Change-Id: Ia8fa61aa4842e7eb96abd03379e6ec8f2536b7f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java index 32bdf3b..67f48a3 100644 --- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java +++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -361,6 +361,10 @@ @Test public void testTombstonesAreBeingForwarded() throws Exception { + // This test requires rooting. Skip on user builds where rooting is impossible. + final String buildType = getDevice().getProperty("ro.build.type"); + assumeTrue("userdebug".equals(buildType) || "eng".equals(buildType)); + // Note this test relies on logcat values being printed by tombstone_transmit on // and the reeceiver on host (virtualization_service) final String configPath = "assets/vm_config.json"; // path inside the APK