Fix tempfile usage in vhost_user tests

Fix tests we forgot at crrev.com/c/2717529.

BUG=b:181227406
TEST=cargo test --all-features

Change-Id: I58ffcd8505e7f39891034c9b018fdf04acdde3ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/rust-vmm/vhost/+/2754348
Tested-by: Keiichi Watanabe <keiichiw@chromium.org>
Auto-Submit: Keiichi Watanabe <keiichiw@chromium.org>
Commit-Queue: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>

2 files changed, 13 insertions, 9 deletions

diff --git a/src/vhost_user/master.rs b/src/vhost_user/master.rs
index f098982..e80bbb8 100644
--- a/src/vhost_user/master.rs
+++ b/src/vhost_user/master.rs
@@ -647,8 +647,6 @@ mod tests {
     use super::*;
     use tempfile::{Builder, TempDir};
 
-    use std::path::PathBuf;
-
     fn temp_dir() -> TempDir {
         Builder::new().prefix("/tmp/vhost_test").tempdir().unwrap()
     }
diff --git a/src/vhost_user/mod.rs b/src/vhost_user/mod.rs
index 3aef93d..079b78d 100644
--- a/src/vhost_user/mod.rs
+++ b/src/vhost_user/mod.rs
@@ -181,7 +181,7 @@ mod dummy_slave;
 #[cfg(all(test, feature = "vhost-user-master", feature = "vhost-user-slave"))]
 mod tests {
     use std::os::unix::io::AsRawFd;
-    use std::path::{Path, PathBuf};
+    use std::path::Path;
     use std::sync::{Arc, Barrier, Mutex};
     use std::thread;
 
@@ -190,10 +190,10 @@ mod tests {
     use super::*;
     use crate::backend::VhostBackend;
     use crate::{VhostUserMemoryRegionInfo, VringConfigData};
-    use tempfile::Builder;
+    use tempfile::{Builder, TempDir};
 
-    fn temp_path() -> PathBuf {
-        Builder::new().prefix("/tmp/vhost_test").path().unwrap()
+    fn temp_dir() -> TempDir {
+        Builder::new().prefix("/tmp/vhost_test").tempdir().unwrap()
     }
 
     fn create_slave<P, S>(path: P, backend: Arc<S>) -> (Master, SlaveReqHandler<S>)
@@ -218,7 +218,9 @@ mod tests {
     #[test]
     fn test_set_owner() {
         let slave_be = Arc::new(Mutex::new(DummySlaveReqHandler::new()));
-        let path = temp_path();
+        let dir = temp_dir();
+        let mut path = dir.path().to_owned();
+        path.push("sock");
         let (master, mut slave) = create_slave(&path, slave_be.clone());
 
         assert_eq!(slave_be.lock().unwrap().owned, false);
@@ -234,7 +236,9 @@ mod tests {
     fn test_set_features() {
         let mbar = Arc::new(Barrier::new(2));
         let sbar = mbar.clone();
-        let path = temp_path();
+        let dir = temp_dir();
+        let mut path = dir.path().to_owned();
+        path.push("sock");
         let slave_be = Arc::new(Mutex::new(DummySlaveReqHandler::new()));
         let (mut master, mut slave) = create_slave(&path, slave_be.clone());
 
@@ -278,7 +282,9 @@ mod tests {
     fn test_master_slave_process() {
         let mbar = Arc::new(Barrier::new(2));
         let sbar = mbar.clone();
-        let path = temp_path();
+        let dir = temp_dir();
+        let mut path = dir.path().to_owned();
+        path.push("sock");
         let slave_be = Arc::new(Mutex::new(DummySlaveReqHandler::new()));
         let (mut master, mut slave) = create_slave(&path, slave_be.clone());