Retire TestVsockProtected
Now that pvmfw verified the images being loaded in a protected VM, this
test is failing as it doesn't use signed image. Retire this test and
rely on the larger Microdroid tests which do use signed images and make
use of RPC binder over vsock as well.
Fix: 219037051
Test: atest VirtualizationTestCases.64
Change-Id: I5974fa0f9994ce3d06208c3c113aebdc9608e9be
diff --git a/tests/vsock_test.cc b/tests/vsock_test.cc
index 9550651..c478f64 100644
--- a/tests/vsock_test.cc
+++ b/tests/vsock_test.cc
@@ -49,26 +49,14 @@
static constexpr const char kVmParams[] = "rdinit=/bin/init bin/vsock_client 2 45678 HelloWorld";
static constexpr const char kTestMessage[] = "HelloWorld";
-/** Returns true if the kernel supports protected VMs. */
-bool isProtectedVmSupported() {
- return android::sysprop::HypervisorProperties::hypervisor_protected_vm_supported().value_or(
- false);
-}
-
/** Returns true if the kernel supports unprotected VMs. */
bool isUnprotectedVmSupported() {
return android::sysprop::HypervisorProperties::hypervisor_vm_supported().value_or(false);
}
-void runTest(sp<IVirtualizationService> virtualization_service, bool protected_vm) {
- if (protected_vm) {
- if (!isProtectedVmSupported()) {
- GTEST_SKIP() << "Skipping as protected VMs are not supported on this device.";
- }
- } else {
- if (!isUnprotectedVmSupported()) {
- GTEST_SKIP() << "Skipping as unprotected VMs are not supported on this device.";
- }
+TEST_F(VirtualizationTest, TestVsock) {
+ if (!isUnprotectedVmSupported()) {
+ GTEST_SKIP() << "Skipping as unprotected VMs are not supported on this device.";
}
binder::Status status;
@@ -93,11 +81,11 @@
raw_config.kernel = ParcelFileDescriptor(unique_fd(open(kVmKernelPath, O_RDONLY | O_CLOEXEC)));
raw_config.initrd = ParcelFileDescriptor(unique_fd(open(kVmInitrdPath, O_RDONLY | O_CLOEXEC)));
raw_config.params = kVmParams;
- raw_config.protectedVm = protected_vm;
+ raw_config.protectedVm = false;
VirtualMachineConfig config(std::move(raw_config));
sp<IVirtualMachine> vm;
- status = virtualization_service->createVm(config, std::nullopt, std::nullopt, &vm);
+ status = mVirtualizationService->createVm(config, std::nullopt, std::nullopt, &vm);
ASSERT_TRUE(status.isOk()) << "Error creating VM: " << status;
int32_t cid;
@@ -124,12 +112,4 @@
ASSERT_EQ(msg, kTestMessage);
}
-TEST_F(VirtualizationTest, TestVsock) {
- runTest(mVirtualizationService, false);
-}
-
-TEST_F(VirtualizationTest, TestVsockProtected) {
- runTest(mVirtualizationService, true);
-}
-
} // namespace virt