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_initramfs 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 dd39aedde1
commit fd48779a0d
1 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
tests/integration.rs
View File

@ -4666,49 +4666,48 @@ mod tests {
#[test] #[test]
fn test_initramfs() { fn test_initramfs() {
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 mut kernels = vec![]; let mut kernels = vec![];
kernels.push(direct_kernel_boot_path().unwrap()); kernels.push(direct_kernel_boot_path().unwrap());
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
{ {
let mut pvh_kernel_path = workload_path.clone(); let mut pvh_kernel_path = workload_path.clone();
pvh_kernel_path.push("vmlinux.pvh"); pvh_kernel_path.push("vmlinux.pvh");
kernels.push(pvh_kernel_path); kernels.push(pvh_kernel_path);
} }
let mut initramfs_path = workload_path; let mut initramfs_path = workload_path;
initramfs_path.push("alpine_initramfs.img"); initramfs_path.push("alpine_initramfs.img");
let test_string = String::from("axz34i9rylotd8n50wbv6kcj7f2qushme1pg"); let test_string = String::from("axz34i9rylotd8n50wbv6kcj7f2qushme1pg");
let cmdline = format!("console=hvc0 quiet TEST_STRING={}", test_string); let cmdline = format!("console=hvc0 quiet TEST_STRING={}", test_string);
kernels.iter().for_each(|k_path| { kernels.iter().for_each(|k_path| {
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
.args(&["--kernel", k_path.to_str().unwrap()]) .args(&["--kernel", k_path.to_str().unwrap()])
.args(&["--initramfs", initramfs_path.to_str().unwrap()]) .args(&["--initramfs", initramfs_path.to_str().unwrap()])
.args(&["--cmdline", &cmdline]) .args(&["--cmdline", &cmdline])
.capture_output() .capture_output()
.spawn() .spawn()
.unwrap(); .unwrap();
thread::sleep(std::time::Duration::new(20, 0)); thread::sleep(std::time::Duration::new(20, 0));
let _ = child.kill(); let _ = child.kill();
match child.wait_with_output() { let output = child.wait_with_output().unwrap();
Ok(out) => {
let s = String::from_utf8_lossy(&out.stdout); let r = std::panic::catch_unwind(|| {
aver_ne!(tb, s.lines().position(|line| line == test_string), None); let s = String::from_utf8_lossy(&output.stdout);
}
Err(_) => aver!(tb, false), assert_ne!(s.lines().position(|line| line == test_string), None);
}
}); });
Ok(())
handle_child_output(r, &output);
}); });
} }