Replace tempdir in database test suite (#958)

Author: terror

Cargo.lock

@@ -22,6 +22,7 @@ rayon = "1.11.0"
 regex = "1.12.2"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
+tempfile = "3.25.0"
 tokio = { version = "1.49.0", features = ["rt-multi-thread", "macros"] }
 tracing = "0.1.44"
 tracing-subscriber = { version = "0.3.22", features = ["env-filter", "json"] }
@@ -67,5 +68,5 @@ walkdir = "2.5.0"
 hyper = { version = "1.8.1", features = ["server"] }
 mockito = { workspace = true }
 pretty_assertions = { workspace = true }
-tempfile = "3.24.0"
+tempfile = { workspace = true }
 tower = { version = "0.5.3", features = ["util"] }

Cargo.toml

@@ -22,4 +22,4 @@ tracing = { workspace = true }
 include_dir = { workspace = true }
 pretty_assertions = { workspace = true }
 regex = { workspace = true }
-tempdir = "0.3.7"
+tempfile = { workspace = true }

crates/db/Cargo.toml

@@ -1224,7 +1224,7 @@ mod tests {
   async fn course_seeding_is_accurate() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -1244,7 +1244,7 @@ mod tests {
   async fn course_seeding_does_not_insert_duplicates() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -1271,7 +1271,7 @@ mod tests {
   async fn courses_get_updated_when_seeding() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -1317,7 +1317,7 @@ mod tests {
   async fn course_terms_update_properly_when_seeding() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -1362,7 +1362,7 @@ mod tests {
   async fn search_is_accurate() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -1391,7 +1391,7 @@ mod tests {
   async fn get_course_by_id() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -1420,7 +1420,7 @@ mod tests {
   async fn search_course_by_id_exact() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -1449,7 +1449,7 @@ mod tests {
   async fn fuzzy_search_course_by_title() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -1478,7 +1478,7 @@ mod tests {
   async fn get_courses_with_limit() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -1498,7 +1498,7 @@ mod tests {
   async fn get_courses_with_sort_filter() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -2055,7 +2055,7 @@ mod tests {
   async fn filter_courses_by_subject() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -2096,7 +2096,7 @@ mod tests {
   async fn filter_courses_by_level() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -2137,7 +2137,7 @@ mod tests {
   async fn filter_courses_by_term() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -2212,7 +2212,7 @@ mod tests {
   async fn search_instructor_by_name_exact() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 
@@ -2602,7 +2602,7 @@ mod tests {
   async fn filter_courses_by_query() {
     let TestContext { db, db_name } = TestContext::new().await;
 
-    let tempdir = TempDir::new(&db_name).unwrap();
+    let tempdir = TempDir::with_prefix(&db_name).unwrap();
 
     let source = tempdir.path().join("courses.json");
 

crates/db/src/db.rs

@@ -30,7 +30,7 @@ use {
   include_dir::{Dir, include_dir},
   model::DateTime,
   std::sync::atomic::{AtomicUsize, Ordering},
-  tempdir::TempDir,
+  tempfile::TempDir,
 };
 
 pub type Result<T = ()> = std::result::Result<T, Error>;

crates/db/src/lib.rs

@@ -42,9 +42,7 @@ impl Hash for PathBuf {
 
 #[cfg(test)]
 mod tests {
-  use super::*;
-  use std::io::Write;
-  use tempfile::tempdir;
+  use {super::*, std::io::Write, tempfile::tempdir};
 
   #[test]
   fn hash_file() {