From 25ff29131054be5692e41024add2a83e567e5c2c Mon Sep 17 00:00:00 2001 From: James Lucas Date: Fri, 6 May 2022 17:40:04 -0500 Subject: [PATCH] Tests: Remove queue overrides / limit concurrency (#433) Ensure all backend variations are properly end-to-end tested by removing in-memory queue override; this currently requires limiting test concurrency to 1 because tests are currently sharing backend services. --- server/run-tests.sh | 2 +- server/svix-server/tests/utils/mod.rs | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/server/run-tests.sh b/server/run-tests.sh index 928d618aa..fca65598a 100755 --- a/server/run-tests.sh +++ b/server/run-tests.sh @@ -2,7 +2,7 @@ # Run tests with various configurations: -TEST_COMMAND="cargo test --all --all-features --all-targets" +TEST_COMMAND="cargo test --all --all-features --all-targets -- --test-threads=1" # Common variables: export DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres" diff --git a/server/svix-server/tests/utils/mod.rs b/server/svix-server/tests/utils/mod.rs index 9cb21120b..7c4dee5f1 100644 --- a/server/svix-server/tests/utils/mod.rs +++ b/server/svix-server/tests/utils/mod.rs @@ -212,12 +212,7 @@ pub fn get_default_test_config() -> ConfigurationInner { let _ = dotenv::dotenv(); let cfg = svix_server::cfg::load().unwrap(); - // Change the queue type to in-memory. This is necessary so test workers don't pick up messages - // from other tests whose threads then abort at the end of a test before associated database - // transactions are complete. - let mut cfg = cfg.as_ref().clone(); - cfg.queue_type = svix_server::cfg::QueueType::Memory; - cfg + cfg.as_ref().clone() } pub fn start_svix_server() -> (TestClient, tokio::task::JoinHandle<()>) {