Merge "rialto_test: Run non-protected tests sequentially" into main am: b349ce3f2d am: e27874ca69
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3247453
Change-Id: I737dd78d98cd81e019786f38701f2900a737f0a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/guest/rialto/tests/test.rs b/guest/rialto/tests/test.rs
index 42a4284..582b69e 100644
--- a/guest/rialto/tests/test.rs
+++ b/guest/rialto/tests/test.rs
@@ -68,14 +68,9 @@
#[test]
fn process_requests_in_non_protected_vm() -> Result<()> {
- check_processing_requests(VmType::NonProtectedVm, None)
-}
-
-#[ignore] // TODO(b/360077974): Figure out why this is flaky.
-#[test]
-fn process_requests_in_non_protected_vm_with_extra_ram() -> Result<()> {
const MEMORY_MB: i32 = 300;
- check_processing_requests(VmType::NonProtectedVm, Some(MEMORY_MB))
+ check_processing_requests(VmType::NonProtectedVm, Some(MEMORY_MB))?;
+ check_processing_requests(VmType::NonProtectedVm, None)
}
fn check_processing_requests(vm_type: VmType, vm_memory_mb: Option<i32>) -> Result<()> {