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_simple_launch to the new methodology

Browse Source 
This is the last test to be ported to the new methodology.

Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen 2020-09-02 18:44:27 -07:00 committed by Sebastien Boeuf
parent cb2f11724a
commit 365b947023
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
tests/integration.rs
View File

@ -5,9 +5,6 @@
#[cfg(test)] #[cfg(test)]
#[cfg(feature = "integration_tests")] #[cfg(feature = "integration_tests")]
#[macro_use]
extern crate credibility;
#[cfg(test)] #[cfg(test)]
#[cfg(feature = "integration_tests")] #[cfg(feature = "integration_tests")]
#[macro_use] #[macro_use]
@ -2153,44 +2150,42 @@ mod tests {
#[cfg_attr(not(feature = "mmio"), test)] #[cfg_attr(not(feature = "mmio"), test)]
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
fn test_simple_launch() { fn test_simple_launch() {
test_block!(tb, "", { let mut bionic = UbuntuDiskConfig::new(BIONIC_IMAGE_NAME.to_string());
let mut bionic = UbuntuDiskConfig::new(BIONIC_IMAGE_NAME.to_string()); let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let mut focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
vec![ vec![
&mut bionic as &mut dyn DiskConfig, &mut bionic as &mut dyn DiskConfig,
&mut focal as &mut dyn DiskConfig, &mut focal as &mut dyn DiskConfig,
] ]
.iter_mut() .iter_mut()
.for_each(|disk_config| { .for_each(|disk_config| {
let guest = Guest::new(*disk_config); let guest = Guest::new(*disk_config);
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", guest.fw_path.as_str()]) .args(&["--kernel", guest.fw_path.as_str()])
.default_raw_disks() .default_raw_disks()
.default_net() .default_net()
.args(&["--serial", "tty", "--console", "off"]) .args(&["--serial", "tty", "--console", "off"])
.spawn() .capture_output()
.unwrap(); .spawn()
.unwrap();
thread::sleep(std::time::Duration::new(20, 0)); thread::sleep(std::time::Duration::new(20, 0));
aver_eq!(tb, guest.get_cpu_count().unwrap_or_default(), 1); let r = std::panic::catch_unwind(|| {
aver_eq!(tb, guest.get_initial_apicid().unwrap_or(1), 0); assert_eq!(guest.get_cpu_count().unwrap_or_default(), 1);
aver!(tb, guest.get_total_memory().unwrap_or_default() > 480_000); assert_eq!(guest.get_initial_apicid().unwrap_or(1), 0);
aver!(tb, guest.get_entropy().unwrap_or_default() >= 900); assert!(guest.get_total_memory().unwrap_or_default() > 480_000);
aver_eq!( assert!(guest.get_entropy().unwrap_or_default() >= 900);
tb, assert_eq!(guest.get_pci_bridge_class().unwrap_or_default(), "0x060000");
guest.get_pci_bridge_class().unwrap_or_default(),
"0x060000"
);
let _ = child.kill();
let _ = child.wait();
}); });
Ok(())
let _ = child.kill();
let output = child.wait_with_output().unwrap();
handle_child_output(r, &output);
}); });
} }