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

tests: Port test_virtio_pmem 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 7b621bde4f
commit 4983e5c322
1 changed files with 50 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
tests/integration.rs
View File

@ -1684,52 +1684,51 @@ mod tests {
} }
fn test_virtio_pmem(discard_writes: bool, specify_size: bool) { fn test_virtio_pmem(discard_writes: bool, specify_size: 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);
let mut workload_path = dirs::home_dir().unwrap(); let mut workload_path = dirs::home_dir().unwrap();
workload_path.push("workloads"); workload_path.push("workloads");
let kernel_path = direct_kernel_boot_path().unwrap(); let kernel_path = direct_kernel_boot_path().unwrap();
let mut pmem_temp_file = NamedTempFile::new().unwrap(); let mut pmem_temp_file = NamedTempFile::new().unwrap();
pmem_temp_file.as_file_mut().set_len(128 << 20).unwrap(); pmem_temp_file.as_file_mut().set_len(128 << 20).unwrap();
std::process::Command::new("mkfs.ext4") std::process::Command::new("mkfs.ext4")
.arg(pmem_temp_file.path()) .arg(pmem_temp_file.path())
.output() .output()
.expect("Expect creating disk image to succeed"); .expect("Expect creating disk image to succeed");
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
.args(&["--cpus", "boot=1"]) .args(&["--cpus", "boot=1"])
.args(&["--memory", "size=512M"]) .args(&["--memory", "size=512M"])
.args(&["--kernel", kernel_path.to_str().unwrap()]) .args(&["--kernel", kernel_path.to_str().unwrap()])
.args(&["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE]) .args(&["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
.default_disks() .default_disks()
.default_net() .default_net()
.args(&[ .args(&[
"--pmem", "--pmem",
format!( format!(
"file={}{}{}", "file={}{}{}",
pmem_temp_file.path().to_str().unwrap(), pmem_temp_file.path().to_str().unwrap(),
if specify_size { ",size=128M" } else { "" }, if specify_size { ",size=128M" } else { "" },
if discard_writes { if discard_writes {
",discard_writes=on" ",discard_writes=on"
} else { } else {
"" ""
} }
) )
.as_str(), .as_str(),
]) ])
.spawn() .capture_output()
.unwrap(); .spawn()
.unwrap();
thread::sleep(std::time::Duration::new(20, 0));
thread::sleep(std::time::Duration::new(20, 0));
let r = std::panic::catch_unwind(|| {
// Check for the presence of /dev/pmem0 // Check for the presence of /dev/pmem0
aver_eq!( assert_eq!(
tb,
guest guest
.ssh_command("ls /dev/pmem0") .ssh_command("ls /dev/pmem0")
.unwrap_or_default() .unwrap_or_default()
@ -1738,17 +1737,13 @@ mod tests {
); );
// Check changes persist after reboot // Check changes persist after reboot
aver_eq!( assert_eq!(guest.ssh_command("sudo mount /dev/pmem0 /mnt").unwrap(), "");
tb, assert_eq!(guest.ssh_command("ls /mnt").unwrap(), "lost+found\n");
guest.ssh_command("sudo mount /dev/pmem0 /mnt").unwrap(),
""
);
aver_eq!(tb, guest.ssh_command("ls /mnt").unwrap(), "lost+found\n");
guest guest
.ssh_command("echo test123 | sudo tee /mnt/test") .ssh_command("echo test123 | sudo tee /mnt/test")
.unwrap(); .unwrap();
aver_eq!(tb, guest.ssh_command("sudo umount /mnt").unwrap(), ""); assert_eq!(guest.ssh_command("sudo umount /mnt").unwrap(), "");
aver_eq!(tb, guest.ssh_command("ls /mnt").unwrap(), ""); assert_eq!(guest.ssh_command("ls /mnt").unwrap(), "");
guest.ssh_command("sudo reboot").unwrap(); guest.ssh_command("sudo reboot").unwrap();
thread::sleep(std::time::Duration::new(30, 0)); thread::sleep(std::time::Duration::new(30, 0));
@ -1758,26 +1753,21 @@ 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);
aver_eq!( assert_eq!(guest.ssh_command("sudo mount /dev/pmem0 /mnt").unwrap(), "");
tb, assert_eq!(
guest.ssh_command("sudo mount /dev/pmem0 /mnt").unwrap(),
""
);
aver_eq!(
tb,
guest guest
.ssh_command("sudo cat /mnt/test") .ssh_command("sudo cat /mnt/test")
.unwrap_or_default() .unwrap_or_default()
.trim(), .trim(),
if discard_writes { "" } else { "test123" } if discard_writes { "" } else { "test123" }
); );
let _ = child.kill();
let _ = child.wait();
Ok(())
}); });
let _ = child.kill();
let output = child.wait_with_output().unwrap();
handle_child_output(r, &output);
} }
fn get_fd_count(pid: u32) -> usize { fn get_fd_count(pid: u32) -> usize {