External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-15 13:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Port test_virtio_vsock to new methodology

Browse Source 
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-08-12 12:20:14 +01:00 committed by Sebastien Boeuf
parent 4983e5c322
commit 9dd4625fb4
1 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/integration.rs
View File

@ -1775,7 +1775,6 @@ mod tests {
} }
fn _test_virtio_vsock(hotplug: bool) { fn _test_virtio_vsock(hotplug: bool) {
test_block!(tb, "", {
let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let guest = Guest::new(&mut focal); let guest = Guest::new(&mut focal);
@ -1800,28 +1799,27 @@ mod tests {
cmd.args(&["--vsock", format!("cid=3,socket={}", socket).as_str()]); cmd.args(&["--vsock", format!("cid=3,socket={}", socket).as_str()]);
} }
let mut child = cmd.spawn().unwrap(); let mut child = cmd.capture_output().spawn().unwrap();
thread::sleep(std::time::Duration::new(20, 0)); thread::sleep(std::time::Duration::new(20, 0));
let r = std::panic::catch_unwind(|| {
if hotplug { if hotplug {
let (cmd_success, cmd_output) = remote_command_w_output( let (cmd_success, cmd_output) = remote_command_w_output(
&api_socket, &api_socket,
"add-vsock", "add-vsock",
Some(format!("cid=3,socket={},id=test0", socket).as_str()), Some(format!("cid=3,socket={},id=test0", socket).as_str()),
); );
aver!(tb, cmd_success); assert!(cmd_success);
aver!( assert!(String::from_utf8_lossy(&cmd_output)
tb, .contains("{\"id\":\"test0\",\"bdf\":\"0000:00:06.0\"}"));
String::from_utf8_lossy(&cmd_output)
.contains("{\"id\":\"test0\",\"bdf\":\"0000:00:06.0\"}")
);
thread::sleep(std::time::Duration::new(10, 0)); thread::sleep(std::time::Duration::new(10, 0));
// Check adding a second one fails // Check adding a second one fails
aver!( assert!(!remote_command(
tb, &api_socket,
!remote_command(&api_socket, "add-vsock", Some("cid=1234,socket=/tmp/fail")) "add-vsock",
); Some("cid=1234,socket=/tmp/fail")
));
} }
// Validate vsock works as expected. // Validate vsock works as expected.
@ -1839,7 +1837,7 @@ mod tests {
.parse::<u32>() .parse::<u32>()
.unwrap_or(1); .unwrap_or(1);
aver_eq!(tb, reboot_count, 0); assert_eq!(reboot_count, 0);
guest.ssh_command("sudo reboot").unwrap_or_default(); guest.ssh_command("sudo reboot").unwrap_or_default();
thread::sleep(std::time::Duration::new(30, 0)); thread::sleep(std::time::Duration::new(30, 0));
@ -1849,23 +1847,20 @@ mod tests {
.trim() .trim()
.parse::<u32>() .parse::<u32>()
.unwrap_or_default(); .unwrap_or_default();
aver_eq!(tb, reboot_count, 1); assert_eq!(reboot_count, 1);
// Validate vsock still works after a reboot. // Validate vsock still works after a reboot.
guest.check_vsock(socket.as_str()); guest.check_vsock(socket.as_str());
} }
if hotplug { if hotplug {
aver!( assert!(remote_command(&api_socket, "remove-device", Some("test0")));
tb,
remote_command(&api_socket, "remove-device", Some("test0"))
);
} }
});
let _ = child.kill(); let _ = child.kill();
let _ = child.wait(); let output = child.wait_with_output().unwrap();
Ok(()) handle_child_output(r, &output);
});
} }
fn get_pss(pid: u32) -> u32 { fn get_pss(pid: u32) -> u32 {