rialto_test: Run non-protected tests sequentially
They were racing for the hard-coded CID port number, resulting in
Error: Address already in use (os error 98)
Instead, run them one after the other to avoid this.
Note: #[test] functions run in their own process so Mutex can't be used.
Bug: 360077974
Test: atest rialto_test
Change-Id: Icf1458f1a5b8811494aa07d49b561516eb0bd1a8
diff --git a/guest/rialto/tests/test.rs b/guest/rialto/tests/test.rs
index 7c0d9dc..90721b9 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<()> {