test-utils: Use serial_test re-export in tags macro

Now you don't need to remember to add `serial_test` to your
`Cargo.toml`, just `test-utils`.

Change-Id: I22be02666681bed7a3a581c86c2f4949f7965240
Reviewed-on: https://gerrit.readyset.name/c/readyset/+/9563
Tested-by: Buildkite CI
Reviewed-by: Johnathan Davis <[email protected]>

Author: mvzink

Cargo.lock

@@ -24,7 +24,6 @@ readyset-data = { path = "../readyset-data/" }
 test-strategy = { workspace = true }
 proptest = { workspace = true }
 mysql_async = { workspace = true }
-serial_test = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 test-utils = { path = "../test-utils" }
 

data-generator/Cargo.toml

@@ -43,7 +43,6 @@ postgres = { workspace = true, features = [
 ] }
 readyset-sql-parsing = { path = "../readyset-sql-parsing" }
 regex = { workspace = true }
-serial_test = { workspace = true }
 test-utils = { path = "../test-utils" }
 tokio = { workspace = true, features = ["full"] }
 tokio-postgres = { workspace = true, features = [

dataflow-expression/Cargo.toml

@@ -59,7 +59,6 @@ readyset-tracing = { path = "../readyset-tracing" }
 postgres-native-tls = { workspace = true }
 criterion = { workspace = true, features = ["html_reports"] }
 test-utils = { path = "../test-utils" }
-serial_test = { workspace = true }
 
 [[bench]]
 name = "parse"

psql-srv/Cargo.toml

@@ -26,7 +26,6 @@ readyset-util = { path = "../readyset-util" }
 
 [dev-dependencies]
 mysql_async.workspace = true
-serial_test = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tokio-postgres.workspace = true
 test-utils = { path = "../test-utils" }

query-generator/Cargo.toml

@@ -81,7 +81,6 @@ readyset-sql-passes = { path = "../readyset-sql-passes" }
 replication-offset = { path = "../replication-offset" }
 
 [dev-dependencies]
-serial_test = { workspace = true }
 tempfile = { workspace = true }
 test-utils = { path = "../test-utils" }
 

readyset-client/Cargo.toml

@@ -37,7 +37,6 @@ readyset-client-metrics = { path = "../readyset-client-metrics" }
 readyset-clustertest-macros = { path = "./macros" }
 readyset-tracing = { path = "../readyset-tracing" }
 rust_decimal = { workspace = true }
-serial_test = { workspace = true }
 test-utils = { path = "../test-utils" }
 
 [build-dependencies]

readyset-clustertest/Cargo.toml

@@ -66,7 +66,6 @@ features = [
 derive_more = { workspace = true }
 bincode = { workspace = true }
 criterion = { workspace = true, features = ["async_tokio"] }
-serial_test = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 test-utils = { path = "../test-utils" }
 

readyset-data/Cargo.toml

@@ -23,7 +23,6 @@ readyset-client-test-helpers = { path = "../readyset-client-test-helpers", featu
 readyset-tracing = { path = "../readyset-tracing" }
 readyset-sql = { path = "../readyset-sql" }
 readyset-util = { path = "../readyset-util" }
-serial_test = { workspace = true }
 test-strategy = { workspace = true }
 test-utils = { path = "../test-utils" }
 tokio = { workspace = true, features = ["full"] }

readyset-e2e-tests/Cargo.toml

@@ -26,7 +26,7 @@ readyset-client-metrics = { path = "../readyset-client-metrics" }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true, features = ["release_max_level_debug"] }
 thiserror = { workspace = true }
-mysql_common = { workspace = true, features = ["bigdecimal","binlog"] }
+mysql_common = { workspace = true, features = ["bigdecimal", "binlog"] }
 itertools = { workspace = true }
 readyset-sql = { path = "../readyset-sql" }
 readyset-util = { path = "../readyset-util" }
@@ -40,7 +40,6 @@ readyset-telemetry-reporter = { path = "../readyset-telemetry-reporter", feature
     "test-util",
 ] }
 readyset-server = { path = "../readyset-server" }
-serial_test = { workspace = true }
 test-utils = { path = "../test-utils" }
 chrono = { workspace = true }
 futures = { workspace = true }

readyset-mysql/Cargo.toml

@@ -59,7 +59,6 @@ criterion = { workspace = true, features = ["async_tokio"] }
 readyset-sql-parsing = { path = "../readyset-sql-parsing" }
 readyset-tracing = { path = "../readyset-tracing" }
 test-utils = { path = "../test-utils" }
-serial_test = { workspace = true }
 
 [[bench]]
 name = "proxy"

readyset-psql/Cargo.toml

@@ -57,7 +57,6 @@ criterion = { workspace = true, features = ["html_reports"] }
 futures = { workspace = true }
 pprof = { workspace = true, features = ["flamegraph", "criterion"] }
 readyset-sql-parsing = { path = "../readyset-sql-parsing" }
-serial_test = { workspace = true }
 temp-dir = { workspace = true }
 test-utils = { path = "../test-utils" }
 

readyset/Cargo.toml

@@ -26,7 +26,7 @@ bit-vec = { workspace = true, features = ["serde"] }
 serde = { workspace = true, features = ["derive"] }
 nom_locate = { workspace = true }
 deadpool-postgres = { workspace = true }
-mysql_common = { workspace = true, features =  ["binlog"] }
+mysql_common = { workspace = true, features = ["binlog"] }
 
 tokio-postgres = { workspace = true, features = [
     "with-chrono-0_4",
@@ -38,7 +38,7 @@ postgres-types = { workspace = true, features = [
 ] }
 postgres-native-tls = { workspace = true }
 postgres-protocol = { workspace = true }
-mysql_async = { workspace = true}
+mysql_async = { workspace = true }
 
 nom-sql = { path = "../nom-sql" }
 readyset-client = { path = "../readyset-client" }
@@ -57,7 +57,6 @@ readyset-telemetry-reporter = { path = "../readyset-telemetry-reporter" }
 replication-offset = { path = "../replication-offset" }
 
 [dev-dependencies]
-serial_test = { workspace = true }
 test-utils = { path = "../test-utils" }
 readyset-server = { path = "../readyset-server" }
 readyset-telemetry-reporter = { path = "../readyset-telemetry-reporter", features = [

replicators/Cargo.toml

@@ -175,18 +175,28 @@ pub fn tags(args: TokenStream, item: TokenStream) -> TokenStream {
     }
 
     // Special handling for `serial`: add the in-process mutex from `serial_test`
-    if tags.iter().any(|tag| tag == "serial") {
+    let uses_serial = tags.iter().any(|tag| tag == "serial");
+    if uses_serial {
         let serial_attr = parse_quote! {
-            #[serial_test::serial(#serial_groups)]
+            #[::test_utils::serial_test::serial(#serial_groups)]
         };
         item.attrs.push(serial_attr);
     }
 
     let test_name = mem::replace(&mut item.sig.ident, Ident::new("test", Span::call_site()));
     tags.insert(0, test_name);
 
-    let mut out = quote! {
-        #item
+    // In addition to adding the attribute, we also need to make `serial_test` resolve in scope,
+    // because the macro adds a call out to the crate for a runtime function.
+    let mut out = if uses_serial {
+        quote! {
+            use ::test_utils::serial_test;
+            #item
+        }
+    } else {
+        quote! {
+            #item
+        }
     };
 
     for group in tags.into_iter().rev() {

test-utils/proc-macros/src/lib.rs

@@ -3,7 +3,10 @@
 
 pub use test_utils_proc_macros::{skip_flaky_finder, slow, tags};
 
+// Re-export serial_test so we only need to add `readyset_utils` to `Cargo.toml` for packages that
+// use it.
 pub use serial_test;
+
 /// Returns `false` if slow tests should not run, otherwise returns `true`.
 pub fn skip_slow_tests() -> bool {
     let should_skip = std::env::var("RUN_SLOW_TESTS").is_err();