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

tests: Simplify virtiofsd spawning

Browse Source 
The cache methodology is never changed so it can be hardcoded.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-05-26 12:30:16 +01:00 committed by Sebastien Boeuf
parent 0fd6521759
commit f2336413be
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/integration.rs
View File

@ -75,11 +75,7 @@ const DIRECT_KERNEL_BOOT_CMDLINE: &str =
const CONSOLE_TEST_STRING: &str = "Started OpenBSD Secure Shell server"; const CONSOLE_TEST_STRING: &str = "Started OpenBSD Secure Shell server";
fn prepare_virtiofsd( fn prepare_virtiofsd(tmp_dir: &TempDir, shared_dir: &str) -> (std::process::Child, String) {
tmp_dir: &TempDir,
shared_dir: &str,
cache: &str,
) -> (std::process::Child, String) {
let mut workload_path = dirs::home_dir().unwrap(); let mut workload_path = dirs::home_dir().unwrap();
workload_path.push("workloads"); workload_path.push("workloads");
@ -94,7 +90,7 @@ fn prepare_virtiofsd(
let child = Command::new(virtiofsd_path.as_str()) let child = Command::new(virtiofsd_path.as_str())
.args(&["--shared-dir", shared_dir]) .args(&["--shared-dir", shared_dir])
.args(&["--socket-path", virtiofsd_socket_path.as_str()]) .args(&["--socket-path", virtiofsd_socket_path.as_str()])
.args(&["--cache", cache]) .args(&["--cache", "never"])
.spawn() .spawn()
.unwrap(); .unwrap();
@ -1129,8 +1125,7 @@ fn test_boot_from_vhost_user_blk(
fn test_virtio_fs( fn test_virtio_fs(
dax: bool, dax: bool,
cache_size: Option<u64>, cache_size: Option<u64>,
virtiofsd_cache: &str, prepare_daemon: &dyn Fn(&TempDir, &str) -> (std::process::Child, String),
prepare_daemon: &dyn Fn(&TempDir, &str, &str) -> (std::process::Child, String),
hotplug: bool, hotplug: bool,
pci_segment: Option<u16>, pci_segment: Option<u16>,
) { ) {
@ -1168,11 +1163,8 @@ fn test_virtio_fs(
"".to_string() "".to_string()
}; };
let (mut daemon_child, virtiofsd_socket_path) = prepare_daemon( let (mut daemon_child, virtiofsd_socket_path) =
&guest.tmp_dir, prepare_daemon(&guest.tmp_dir, shared_dir.to_str().unwrap());
shared_dir.to_str().unwrap(),
virtiofsd_cache,
);
let mut guest_command = GuestCommand::new(&guest); let mut guest_command = GuestCommand::new(&guest);
guest_command guest_command
@ -1284,11 +1276,8 @@ fn test_virtio_fs(
let (r, hotplug_daemon_child) = if r.is_ok() && hotplug { let (r, hotplug_daemon_child) = if r.is_ok() && hotplug {
thread::sleep(std::time::Duration::new(10, 0)); thread::sleep(std::time::Duration::new(10, 0));
let (daemon_child, virtiofsd_socket_path) = prepare_daemon( let (daemon_child, virtiofsd_socket_path) =
&guest.tmp_dir, prepare_daemon(&guest.tmp_dir, shared_dir.to_str().unwrap());
shared_dir.to_str().unwrap(),
virtiofsd_cache,
);
let r = std::panic::catch_unwind(|| { let r = std::panic::catch_unwind(|| {
thread::sleep(std::time::Duration::new(10, 0)); thread::sleep(std::time::Duration::new(10, 0));
@ -3120,24 +3109,24 @@ mod parallel {
#[test] #[test]
fn test_virtio_fs_dax_off() { fn test_virtio_fs_dax_off() {
test_virtio_fs(false, None, "never", &prepare_virtiofsd, false, None) test_virtio_fs(false, None, &prepare_virtiofsd, false, None)
} }
#[test] #[test]
fn test_virtio_fs_hotplug_dax_off() { fn test_virtio_fs_hotplug_dax_off() {
test_virtio_fs(false, None, "never", &prepare_virtiofsd, true, None) test_virtio_fs(false, None, &prepare_virtiofsd, true, None)
} }
#[test] #[test]
#[cfg(not(feature = "mshv"))] #[cfg(not(feature = "mshv"))]
fn test_virtio_fs_multi_segment_hotplug() { fn test_virtio_fs_multi_segment_hotplug() {
test_virtio_fs(false, None, "never", &prepare_virtiofsd, true, Some(15)) test_virtio_fs(false, None, &prepare_virtiofsd, true, Some(15))
} }
#[test] #[test]
#[cfg(not(feature = "mshv"))] #[cfg(not(feature = "mshv"))]
fn test_virtio_fs_multi_segment() { fn test_virtio_fs_multi_segment() {
test_virtio_fs(false, None, "never", &prepare_virtiofsd, false, Some(15)) test_virtio_fs(false, None, &prepare_virtiofsd, false, Some(15))
} }
#[test] #[test]