kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Use wait_until() to check for vhost-user socket

Browse Source 
Rather than use a fixed time to wait for the socket to be opened instead
test for its existence using `wait_until()`.

Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
Rob Bradford
2026-04-15 09:07:40 +01:00
parent 52c24136b5
commit a1cfbd6f5c
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cloud-hypervisor/tests/common/tests_wrappers.rs
View File

@@ -569,13 +569,19 @@ pub(crate) fn test_vhost_user_net(
if client_mode_daemon {
child = ch_command.spawn().unwrap();
// Make sure the VMM is waiting for the backend to connect
thread::sleep(std::time::Duration::new(10, 0));
// Wait for the VMM to create the socket before starting the daemon
assert!(wait_until(Duration::from_secs(10), || Path::new(
&vunet_socket_path
)
.exists()));
daemon_child = daemon_command.spawn().unwrap();
} else {
daemon_child = daemon_command.spawn().unwrap();
// Make sure the backend is waiting for the VMM to connect
thread::sleep(std::time::Duration::new(10, 0));
// Wait for the daemon to create the socket before starting the VMM
assert!(wait_until(Duration::from_secs(10), || Path::new(
&vunet_socket_path
)
.exists()));
child = ch_command.spawn().unwrap();
}
@@ -1043,7 +1049,11 @@ pub(crate) fn _test_virtio_fs(
prepare_daemon(&guest.tmp_dir, shared_dir.to_str().unwrap());
let r = std::panic::catch_unwind(|| {
thread::sleep(std::time::Duration::new(10, 0));
// Wait for the daemon socket to be ready
assert!(wait_until(Duration::from_secs(10), || Path::new(
&virtiofsd_socket_path
)
.exists()));
let fs_params = format!(
"id=myfs0,socket={},{}{}",
virtiofsd_socket_path,