From de7cfd61a08b69570a1a6c9c297c910de4059902 Mon Sep 17 00:00:00 2001 From: Fei Li Date: Tue, 15 Jun 2021 18:38:56 +0800 Subject: [PATCH] tests: Clean up unused workload_path Signed-off-by: Fei Li --- tests/integration.rs | 64 -------------------------------------------- 1 file changed, 64 deletions(-) diff --git a/tests/integration.rs b/tests/integration.rs index eb07464a8..ffa8f9b1c 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -925,9 +925,6 @@ mod tests { let guest = Guest::new(Box::new(focal)); let api_socket = temp_api_path(&guest.tmp_dir); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let host_mac = if generate_host_mac { @@ -1082,9 +1079,6 @@ mod tests { let guest = Guest::new(Box::new(focal)); let api_socket = temp_api_path(&guest.tmp_dir); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let (blk_params, daemon_child) = { @@ -1231,9 +1225,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let disk_path = guest.disk_config.disk(DiskType::OperatingSystem).unwrap(); @@ -1477,9 +1468,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let pmem_temp_file = TempFile::new().unwrap(); @@ -1558,9 +1546,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let socket = temp_vsock_path(&guest.tmp_dir); @@ -2147,9 +2132,6 @@ mod tests { let guest = Guest::new(Box::new(focal)); let api_socket = temp_api_path(&guest.tmp_dir); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let mut child = GuestCommand::new(&guest) @@ -2218,9 +2200,6 @@ mod tests { let guest = Guest::new(Box::new(focal)); let api_socket = temp_api_path(&guest.tmp_dir); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let mut child = GuestCommand::new(&guest) @@ -2331,8 +2310,6 @@ mod tests { fn test_direct_kernel_boot() { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); let kernel_path = direct_kernel_boot_path(); @@ -2701,8 +2678,6 @@ mod tests { fn test_boot_from_virtio_pmem() { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); let kernel_path = direct_kernel_boot_path(); @@ -2759,9 +2734,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let mut child = GuestCommand::new(&guest) @@ -2899,9 +2871,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); #[cfg(target_arch = "x86_64")] @@ -3118,9 +3087,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let mut child = GuestCommand::new(&guest) @@ -3456,8 +3422,6 @@ mod tests { fn test_direct_kernel_boot_noacpi() { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); let kernel_path = direct_kernel_boot_path(); @@ -3552,8 +3516,6 @@ mod tests { fn test_api_create_boot() { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); let api_socket = temp_api_path(&guest.tmp_dir); @@ -3603,8 +3565,6 @@ mod tests { fn test_api_pause_resume() { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); let api_socket = temp_api_path(&guest.tmp_dir); @@ -3685,8 +3645,6 @@ mod tests { fn test_virtio_iommu() { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); let kernel_path = direct_kernel_boot_path(); @@ -3862,8 +3820,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); let api_socket = temp_api_path(&guest.tmp_dir); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); let kernel_path = direct_kernel_boot_path(); @@ -3946,8 +3902,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); let api_socket = temp_api_path(&guest.tmp_dir); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); let kernel_path = direct_kernel_boot_path(); @@ -4029,8 +3983,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); let api_socket = temp_api_path(&guest.tmp_dir); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); let kernel_path = direct_kernel_boot_path(); @@ -4105,8 +4057,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); let api_socket = temp_api_path(&guest.tmp_dir); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); let kernel_path = direct_kernel_boot_path(); @@ -4160,8 +4110,6 @@ mod tests { fn test_memory_overhead() { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); let kernel_path = direct_kernel_boot_path(); @@ -4203,9 +4151,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let api_socket = temp_api_path(&guest.tmp_dir); @@ -4362,9 +4307,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let api_socket = temp_api_path(&guest.tmp_dir); @@ -4474,9 +4416,6 @@ mod tests { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let api_socket = temp_api_path(&guest.tmp_dir); @@ -4621,9 +4560,6 @@ mod tests { fn test_snapshot_restore() { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let mut workload_path = dirs::home_dir().unwrap(); - workload_path.push("workloads"); - let kernel_path = direct_kernel_boot_path(); let api_socket = temp_api_path(&guest.tmp_dir);