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: Remove explicit sleeps from net tests

Browse Source 
Use `wait_until()` with the SSH command for detecting if the net device
is present/absent as part of hotplugging/unplugging.

Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
Rob Bradford
2026-04-15 11:33:15 +01:00
parent 9ca6d4ca41
commit 0107675eb1
1 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2928,18 +2928,12 @@ pub(crate) fn _test_net_hotplug(
);
}
thread::sleep(std::time::Duration::new(5, 0));
// 2 network interfaces + default localhost ==> 3 interfaces
assert_eq!(
// Wait for the hotplugged network interface to appear
assert!(wait_until(Duration::from_secs(10), || {
guest
.ssh_command("ip -o link | wc -l")
.unwrap()
.trim()
.parse::<u32>()
.unwrap_or_default(),
3
);
.is_ok_and(|s| s.trim().parse::<u32>().unwrap_or_default() == 3)
}));
// Test the same using the added network interface's IP
assert_eq!(
@@ -2956,9 +2950,13 @@ pub(crate) fn _test_net_hotplug(
3
);
// Remove network
// Remove network and wait for it to disappear
assert!(remote_command(&api_socket, "remove-device", Some("test0"),));
thread::sleep(std::time::Duration::new(5, 0));
assert!(wait_until(Duration::from_secs(10), || {
guest
.ssh_command("ip -o link | wc -l")
.is_ok_and(|s| s.trim().parse::<u32>().unwrap_or_default() == 2)
}));
// Add network
let (cmd_success, cmd_output) = remote_command_w_output(
@@ -2991,18 +2989,12 @@ pub(crate) fn _test_net_hotplug(
);
}
thread::sleep(std::time::Duration::new(5, 0));
// 2 network interfaces + default localhost ==> 3 interfaces
assert_eq!(
// Wait for the hotplugged network interface to appear
assert!(wait_until(Duration::from_secs(10), || {
guest
.ssh_command("ip -o link | wc -l")
.unwrap()
.trim()
.parse::<u32>()
.unwrap_or_default(),
3
);
.is_ok_and(|s| s.trim().parse::<u32>().unwrap_or_default() == 3)
}));
guest.reboot_linux(0);
@@ -3345,10 +3337,12 @@ pub(crate) fn _test_macvtap(
let mut child = guest_command.capture_output().spawn().unwrap();
if hotplug {
// Give some time to the VMM process to listen to the API
// socket. This is the only requirement to avoid the following
// call to ch-remote from failing.
thread::sleep(std::time::Duration::new(10, 0));
// Wait for the VMM process to listen to the API socket
assert!(wait_until(Duration::from_secs(10), || remote_command(
&api_socket,
"ping",
None
)));
// Hotplug the virtio-net device
let (cmd_success, cmd_output) =
remote_command_w_output(&api_socket, "add-net", Some(&net_params));