test(pgstac): factor out the test mutex

Author: gadomski

crates/pgstac/Cargo.toml

@@ -29,6 +29,7 @@ webpki-roots = { workspace = true, optional = true }
 
 [dev-dependencies]
 pgstac-test = { path = "pgstac-test" }
+pgstac-test-inner = { path = "pgstac-test-inner" }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 tokio-test.workspace = true
 

crates/pgstac/pgstac-test-inner/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "pgstac-test-inner"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]

crates/pgstac/pgstac-test-inner/src/lib.rs

@@ -0,0 +1,3 @@
+use std::sync::Mutex;
+
+pub static MUTEX: Mutex<()> = Mutex::new(());

crates/pgstac/pgstac-test/src/lib.rs

@@ -13,6 +13,8 @@ fn impl_pgstac_test(ast: ItemFn) -> TokenStream {
     let gen = quote! {
         #[tokio::test]
         async fn #ident() {
+            use pgstac_test_inner::MUTEX;
+
             let _mutex = MUTEX.lock().unwrap();
             let config = std::env::var("PGSTAC_RS_TEST_DB")
                 .unwrap_or("postgresql://username:password@localhost:5432/postgis".to_string());

crates/pgstac/src/client.rs

@@ -258,16 +258,8 @@ pub(crate) mod tests {
     use serde_json::{json, Map};
     use stac::{Collection, Item};
     use stac_api::{Fields, Filter, Search, Sortby};
-    use std::sync::Mutex;
     use tokio_postgres::Transaction;
 
-    // This is an absolutely heinous way to ensure that only one test is hitting
-    // the DB at a time -- the MUTEX is used in the pgstac-test crate as part of
-    // the code generated by `pgstac_test`.
-    //
-    // There's got to be a better way.
-    pub(crate) static MUTEX: Mutex<()> = Mutex::new(());
-
     fn longmont() -> Geometry {
         Geometry::new(Value::Point(vec![-105.1019, 40.1672]))
     }

crates/pgstac/src/tls.rs

@@ -96,7 +96,7 @@ impl Default for DummyTlsVerifier {
 
 #[cfg(test)]
 mod tests {
-    use crate::client::tests::MUTEX;
+    use pgstac_test_inner::MUTEX;
 
     #[tokio::test]
     async fn connect() {