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: Speed up test_pci_device_id()

Browse Source 
This test was taking > 300s due to SSH backoffs.

Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
Rob Bradford
2026-04-16 23:11:21 +01:00
parent d449983495
commit 67cf328a9e
2 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
cloud-hypervisor/tests/integration.rs
View File

@@ -5747,22 +5747,26 @@ mod common_parallel {
let (_, _, first_free_device_id, _) = bdf_from_hotplug_response(output.as_str());
assert_ne!(first_free_device_id, 0);
// We expect a match from grep
let _ = String::from(
guest
.ssh_command(&format!(
"lspci -n | grep \"00:{first_free_device_id:02x}.0\""
))
.unwrap()
.trim(),
);
// Wait for the hotplugged device to appear in the guest
assert!(wait_until(Duration::from_secs(10), || {
ssh_command_ip_with_auth(
&format!("lspci -n | grep \"00:{first_free_device_id:02x}.0\""),
&default_guest_auth(),
&guest.network.guest_ip0,
Some(Duration::from_secs(1)),
)
.is_ok()
}));
// Calculate the succeeding device ID
let device_id_to_allocate = first_free_device_id + 1;
// We expect the succeeding device ID to be free
// We expect the succeeding device ID to be free (single attempt, no retries)
assert!(matches!(
guest.ssh_command(&format!(
"lspci -n | grep \"00:{device_id_to_allocate:02x}.0\""
)),
ssh_command_ip_with_auth(
&format!("lspci -n | grep \"00:{device_id_to_allocate:02x}.0\""),
&default_guest_auth(),
&guest.network.guest_ip0,
Some(Duration::from_secs(1)),
),
Err(SshCommandError::NonZeroExitStatus(1))
));
@@ -5783,26 +5787,31 @@ mod common_parallel {
let output = String::from_utf8(cmd_stdout).expect("should work");
let (_, _, allocated_device_id, _) = bdf_from_hotplug_response(output.as_str());
assert_eq!(device_id_to_allocate, allocated_device_id);
// Check that the device ID is really in use
let _ = String::from(
guest
.ssh_command(&format!(
"lspci -n | grep \"00:{allocated_device_id:02x}.0\""
))
.unwrap()
.trim(),
);
// Wait for the hotplugged device to appear in the guest
assert!(wait_until(Duration::from_secs(10), || {
ssh_command_ip_with_auth(
&format!("lspci -n | grep \"00:{allocated_device_id:02x}.0\""),
&default_guest_auth(),
&guest.network.guest_ip0,
Some(Duration::from_secs(1)),
)
.is_ok()
}));
// Remove the first device to create a hole
let cmd_success = remote_command(&api_socket, "remove-device", Some("test0"));
assert!(cmd_success);
thread::sleep(std::time::Duration::new(5, 0));
// We left a hole in the used PCI IDs. The guest sees no device on the respective ID
assert!(matches!(
guest.ssh_command(&format!(
"lspci -n | grep \"00:{first_free_device_id:02x}.0\""
)),
Err(SshCommandError::NonZeroExitStatus(1))
));
// Wait for the device to disappear from the guest
assert!(wait_until(Duration::from_secs(10), || {
matches!(
ssh_command_ip_with_auth(
&format!("lspci -n | grep \"00:{first_free_device_id:02x}.0\""),
&default_guest_auth(),
&guest.network.guest_ip0,
Some(Duration::from_secs(1)),
),
Err(SshCommandError::NonZeroExitStatus(1))
)
}));
// Reuse the device ID hole by dynamically coalescing with the first free ID
let (cmd_success, cmd_stdout, _) = remote_command_w_output(
&api_socket,
@@ -5821,15 +5830,16 @@ mod common_parallel {
let (_, _, allocated_device_id, _) = bdf_from_hotplug_response(output.as_str());
assert_eq!(first_free_device_id, allocated_device_id);
// Check that guest sees the same device again at the same BDF
let _ = String::from(
guest
.ssh_command(&format!(
"lspci -n | grep \"00:{allocated_device_id:02x}.0\""
))
.unwrap()
.trim(),
);
// Wait for the re-added device to appear in the guest
assert!(wait_until(Duration::from_secs(10), || {
ssh_command_ip_with_auth(
&format!("lspci -n | grep \"00:{allocated_device_id:02x}.0\""),
&default_guest_auth(),
&guest.network.guest_ip0,
Some(Duration::from_secs(1)),
)
.is_ok()
}));
});
kill_child(&mut child);

2
test_infra/src/lib.rs
View File

@@ -702,7 +702,7 @@ pub enum WaitForSshError {
},
}
fn default_guest_auth() -> PasswordAuth {
pub fn default_guest_auth() -> PasswordAuth {
PasswordAuth {
username: String::from("cloud"),
password: String::from("cloud123"),