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_cpu_topology to new test methodology

Browse Source 
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-08-12 12:19:15 +01:00
parent 821cf3add9
commit effff460d4
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
tests/integration.rs
View File

@ -952,34 +952,32 @@ mod tests {
} }
fn test_cpu_topology(threads_per_core: u8, cores_per_package: u8, packages: u8) { fn test_cpu_topology(threads_per_core: u8, cores_per_package: u8, packages: u8) {
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 total_vcpus = threads_per_core * cores_per_package * packages;
let total_vcpus = threads_per_core * cores_per_package * packages; let mut child = GuestCommand::new(&guest)
let mut child = GuestCommand::new(&guest) .args(&[
.args(&[ "--cpus",
"--cpus", &format!(
&format!( "boot={},topology={}:{}:1:{}",
"boot={},topology={}:{}:1:{}", total_vcpus, threads_per_core, cores_per_package, packages
total_vcpus, threads_per_core, cores_per_package, packages ),
), ])
]) .args(&["--memory", "size=512M"])
.args(&["--memory", "size=512M"]) .args(&["--kernel", guest.fw_path.as_str()])
.args(&["--kernel", guest.fw_path.as_str()]) .default_disks()
.default_disks() .default_net()
.default_net() .capture_output()
.spawn() .spawn()
.unwrap(); .unwrap();
thread::sleep(std::time::Duration::new(20, 0)); thread::sleep(std::time::Duration::new(20, 0));
let r = std::panic::catch_unwind(|| {
aver_eq!( assert_eq!(
tb,
guest.get_cpu_count().unwrap_or_default(), guest.get_cpu_count().unwrap_or_default(),
u32::from(total_vcpus) u32::from(total_vcpus)
); );
aver_eq!( assert_eq!(
tb,
guest guest
.ssh_command("lscpu | grep \"per core\" | cut -f 2 -d \":\" | sed \"s# *##\"") .ssh_command("lscpu | grep \"per core\" | cut -f 2 -d \":\" | sed \"s# *##\"")
.unwrap_or_default() .unwrap_or_default()
@ -989,8 +987,7 @@ mod tests {
threads_per_core threads_per_core
); );
aver_eq!( assert_eq!(
tb,
guest guest
.ssh_command("lscpu | grep \"per socket\" | cut -f 2 -d \":\" | sed \"s# *##\"") .ssh_command("lscpu | grep \"per socket\" | cut -f 2 -d \":\" | sed \"s# *##\"")
.unwrap_or_default() .unwrap_or_default()
@ -1000,8 +997,7 @@ mod tests {
cores_per_package cores_per_package
); );
aver_eq!( assert_eq!(
tb,
guest guest
.ssh_command("lscpu | grep \"Socket\" | cut -f 2 -d \":\" | sed \"s# *##\"") .ssh_command("lscpu | grep \"Socket\" | cut -f 2 -d \":\" | sed \"s# *##\"")
.unwrap_or_default() .unwrap_or_default()
@ -1010,11 +1006,12 @@ mod tests {
.unwrap_or(0), .unwrap_or(0),
packages packages
); );
let _ = child.kill();
let _ = child.wait();
Ok(())
}); });
let _ = child.kill();
let output = child.wait_with_output().unwrap();
handle_child_output(r, &output);
} }
type PrepareNetDaemon = type PrepareNetDaemon =