diff --git a/.config/nextest.toml b/.config/nextest.toml index a90da8b186e19..1de244ff846d7 100644 --- a/.config/nextest.toml +++ b/.config/nextest.toml @@ -1,3 +1,6 @@ +[test-groups] +chisel-serial = { max-threads = 1 } + [profile.default] retries = { backoff = "exponential", count = 2, delay = "3s", jitter = true } slow-timeout = { period = "1m", terminate-after = 3 } @@ -9,3 +12,7 @@ slow-timeout = { period = "5m", terminate-after = 4 } [[profile.default.overrides]] filter = "package(foundry-cheatcodes-spec)" retries = 0 + +[[profile.default.overrides]] +filter = "package(chisel)" +test-group = "chisel-serial" diff --git a/Cargo.lock b/Cargo.lock index 8d8e4c679794b..112351887f28b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2200,7 +2200,6 @@ dependencies = [ "semver 1.0.26", "serde", "serde_json", - "serial_test", "solang-parser", "solar-parse", "strum 0.27.1", @@ -8057,31 +8056,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serial_test" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" -dependencies = [ - "futures", - "log", - "once_cell", - "parking_lot", - "scc", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", -] - [[package]] name = "sha1" version = "0.10.6" diff --git a/crates/chisel/Cargo.toml b/crates/chisel/Cargo.toml index 78acd8faaa62b..2e40c92e9f99d 100644 --- a/crates/chisel/Cargo.toml +++ b/crates/chisel/Cargo.toml @@ -61,7 +61,6 @@ walkdir.workspace = true tikv-jemallocator = { workspace = true, optional = true } [dev-dependencies] -serial_test = "3" tracing-subscriber.workspace = true [features] diff --git a/crates/chisel/tests/cache.rs b/crates/chisel/tests/cache.rs index 7016bce09c76e..75da9683f6d8d 100644 --- a/crates/chisel/tests/cache.rs +++ b/crates/chisel/tests/cache.rs @@ -1,11 +1,9 @@ use chisel::session::ChiselSession; use foundry_compilers::artifacts::EvmVersion; use foundry_config::Config; -use serial_test::serial; use std::path::Path; #[test] -#[serial] fn test_cache_directory() { // Get the cache dir // Should be ~/.foundry/cache/chisel @@ -17,7 +15,6 @@ fn test_cache_directory() { } #[test] -#[serial] fn test_create_cache_directory() { // Get the cache dir let cache_dir = ChiselSession::cache_dir().unwrap(); @@ -30,7 +27,6 @@ fn test_create_cache_directory() { } #[test] -#[serial] fn test_write_session() { // Create the cache directory if it doesn't exist let cache_dir = ChiselSession::cache_dir().unwrap(); @@ -58,7 +54,6 @@ fn test_write_session() { } #[test] -#[serial] fn test_write_session_with_name() { // Create the cache directory if it doesn't exist let cache_dir = ChiselSession::cache_dir().unwrap(); @@ -83,7 +78,6 @@ fn test_write_session_with_name() { } #[test] -#[serial] fn test_clear_cache() { // Create a session to validate clearing a non-empty cache directory let cache_dir = ChiselSession::cache_dir().unwrap(); @@ -108,7 +102,6 @@ fn test_clear_cache() { } #[test] -#[serial] fn test_list_sessions() { // Create and clear the cache directory ChiselSession::create_cache_dir().unwrap(); @@ -135,7 +128,6 @@ fn test_list_sessions() { } #[test] -#[serial] fn test_load_cache() { // Create and clear the cache directory ChiselSession::create_cache_dir().unwrap(); @@ -163,7 +155,6 @@ fn test_load_cache() { } #[test] -#[serial] fn test_write_same_session_multiple_times() { // Create and clear the cache directory ChiselSession::create_cache_dir().unwrap(); @@ -186,7 +177,6 @@ fn test_write_same_session_multiple_times() { } #[test] -#[serial] fn test_load_latest_cache() { // Create and clear the cache directory ChiselSession::create_cache_dir().unwrap();