Start VirtualizationService on demand.
Bug: 183582651
Test: atest VirtualizationTestCases
Change-Id: If6cec89206492cf9818a586d9439ebdb62f27342
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index a8fdf19..1b9315a 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -38,17 +38,6 @@
<option name="push-file" key="virt_test_initramfs.img" value="/data/local/tmp/virt-test/initramfs" />
</target_preparer>
- <!-- Root currently needed to run CrosVM.
- TODO: Give sufficient permissions to the adb shell user (b/171240450). -->
- <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
-
- <!-- Run VirtualizationService for the duration of the test.
- TODO: Run VirtualizationService as a system service. -->
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="throw-if-cmd-fail" value="true" />
- <option name="run-command" value="start virtualizationservice" />
- </target_preparer>
-
<test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp/virt-test" />
<option name="module-name" value="VirtualizationTestCases" />
diff --git a/tests/common.cc b/tests/common.cc
index fbda6c6..a9f0807 100644
--- a/tests/common.cc
+++ b/tests/common.cc
@@ -19,10 +19,9 @@
namespace virt {
void VirtualizationTest::SetUp() {
- status_t err =
- getService<IVirtualizationService>(String16("android.system.virtualizationservice"),
- &mVirtualizationService);
- ASSERT_EQ(err, 0);
+ mVirtualizationService = waitForService<IVirtualizationService>(
+ String16("android.system.virtualizationservice"));
+ ASSERT_NE(mVirtualizationService, nullptr);
}
} // namespace virt