From 66b46a277eaf87f905c06716e4019cb2a56bcba5 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Thu, 6 May 2021 19:01:52 +0200 Subject: [PATCH] tests: Remove unused code from Windows integration tests Signed-off-by: Sebastien Boeuf --- tests/integration.rs | 53 ++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/tests/integration.rs b/tests/integration.rs index fd49a8107..b8adafdb6 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -5373,15 +5373,10 @@ mod tests { fn test_windows_guest() { let windows_guest = WindowsGuest::new(); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - - let mut ovmf_path = workload_path.clone(); + let mut ovmf_path = dirs::home_dir().unwrap(); + ovmf_path.push("workloads"); ovmf_path.push(OVMF_NAME); - let mut osdisk_path = workload_path; - osdisk_path.push(WINDOWS_IMAGE_NAME.to_string()); - let mut child = GuestCommand::new(windows_guest.guest()) .args(&["--cpus", "boot=2,kvm_hyperv=on"]) .args(&["--memory", "size=4G"]) @@ -5427,16 +5422,11 @@ mod tests { fn test_windows_guest_snapshot_restore() { let windows_guest = WindowsGuest::new(); - let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap(); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - - let mut ovmf_path = workload_path.clone(); + let mut ovmf_path = dirs::home_dir().unwrap(); + ovmf_path.push("workloads"); ovmf_path.push(OVMF_NAME); - let mut osdisk_path = workload_path; - osdisk_path.push(WINDOWS_IMAGE_NAME.to_string()); - + let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap(); let api_socket = temp_api_path(&tmp_dir); let mut child = GuestCommand::new(windows_guest.guest()) @@ -5521,16 +5511,11 @@ mod tests { fn test_windows_guest_cpu_hotplug() { let windows_guest = WindowsGuest::new(); - let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap(); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - - let mut ovmf_path = workload_path.clone(); + let mut ovmf_path = dirs::home_dir().unwrap(); + ovmf_path.push("workloads"); ovmf_path.push(OVMF_NAME); - let mut osdisk_path = workload_path; - osdisk_path.push(WINDOWS_IMAGE_NAME.to_string()); - + let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap(); let api_socket = temp_api_path(&tmp_dir); let mut child = GuestCommand::new(windows_guest.guest()) @@ -5603,16 +5588,11 @@ mod tests { fn test_windows_guest_ram_hotplug() { let windows_guest = WindowsGuest::new(); - let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap(); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - - let mut ovmf_path = workload_path.clone(); + let mut ovmf_path = dirs::home_dir().unwrap(); + ovmf_path.push("workloads"); ovmf_path.push(OVMF_NAME); - let mut osdisk_path = workload_path; - osdisk_path.push(WINDOWS_IMAGE_NAME.to_string()); - + let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap(); let api_socket = temp_api_path(&tmp_dir); let mut child = GuestCommand::new(windows_guest.guest()) @@ -5685,16 +5665,11 @@ mod tests { fn test_windows_guest_netdev_hotplug() { let windows_guest = WindowsGuest::new(); - let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap(); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - - let mut ovmf_path = workload_path.clone(); + let mut ovmf_path = dirs::home_dir().unwrap(); + ovmf_path.push("workloads"); ovmf_path.push(OVMF_NAME); - let mut osdisk_path = workload_path; - osdisk_path.push(WINDOWS_IMAGE_NAME.to_string()); - + let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap(); let api_socket = temp_api_path(&tmp_dir); let mut child = GuestCommand::new(windows_guest.guest())