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

tests: Re-enable virtio_block_topology on aarch64

Browse Source 
Improve error catching on the steps creating the block device so that we
can understand if qemu-img or losetup is the faulty command leading to
an empty device path.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2022-08-02 14:00:32 +02:00
parent fa0565234c
commit 9524a8ffe8
1 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tests/integration.rs
View File

@ -4935,7 +4935,6 @@ mod parallel {
} }
#[test] #[test]
#[cfg(target_arch = "x86_64")]
fn test_virtio_block_topology() { fn test_virtio_block_topology() {
let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
let guest = Guest::new(Box::new(focal)); let guest = Guest::new(Box::new(focal));
@ -4943,28 +4942,40 @@ mod parallel {
let kernel_path = direct_kernel_boot_path(); let kernel_path = direct_kernel_boot_path();
let test_disk_path = guest.tmp_dir.as_path().join("test.img"); let test_disk_path = guest.tmp_dir.as_path().join("test.img");
Command::new("qemu-img") let output = exec_host_command_output(
.args(&[ format!(
"create", "qemu-img create -f raw {} 16M",
"-f", test_disk_path.to_str().unwrap()
"raw", )
test_disk_path.to_str().unwrap(), .as_str(),
"16M", );
]) if !output.status.success() {
.output() let stdout = String::from_utf8_lossy(&output.stdout);
.expect("qemu-img command failed"); let stderr = String::from_utf8_lossy(&output.stderr);
let out = Command::new("losetup") panic!(
.args(&[ "qemu-img command failed\nstdout\n{}\nstderr\n{}",
"--show", stdout, stderr
"--find", );
"--sector-size=4096", }
test_disk_path.to_str().unwrap(),
]) let output = exec_host_command_output(
.output() format!(
.expect("failed to create loop device") "losetup --show --find --sector-size=4096 {}",
.stdout; test_disk_path.to_str().unwrap()
let _tmp = String::from_utf8_lossy(&out); )
let loop_dev = _tmp.trim(); .as_str(),
);
if !output.status.success() {
let stdout = String::from_utf8_lossy(&output.stdout);
let stderr = String::from_utf8_lossy(&output.stderr);
panic!(
"failed to create loop device\nstdout\n{}\nstderr\n{}",
stdout, stderr
);
}
let tmp = String::from_utf8_lossy(&output.stdout);
let loop_dev = tmp.trim();
let mut child = GuestCommand::new(&guest) let mut child = GuestCommand::new(&guest)
.args(&["--cpus", "boot=1"]) .args(&["--cpus", "boot=1"])