From be66f1227981d1d62f9fd29c58caf27de8880b78 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Fri, 16 Feb 2024 16:06:09 +0100 Subject: [PATCH] Move all integration tests into one test binary - Fewer binaries to link for testing - Allows running specific integration test suite, e.g. `cargo test sqs` - Allows running more tests in parallel See also: https://matklad.github.io/2021/02/27/delete-cargo-integration-tests.html --- omniqueue/tests/{ => it}/gcp_pubsub.rs | 2 -- omniqueue/tests/it/main.rs | 10 ++++++++++ omniqueue/tests/{ => it}/rabbitmq.rs | 2 -- omniqueue/tests/{ => it}/redis.rs | 2 -- omniqueue/tests/{ => it}/redis_cluster.rs | 2 -- omniqueue/tests/{ => it}/sqs.rs | 2 -- 6 files changed, 10 insertions(+), 10 deletions(-) rename omniqueue/tests/{ => it}/gcp_pubsub.rs (99%) create mode 100644 omniqueue/tests/it/main.rs rename omniqueue/tests/{ => it}/rabbitmq.rs (99%) rename omniqueue/tests/{ => it}/redis.rs (99%) rename omniqueue/tests/{ => it}/redis_cluster.rs (99%) rename omniqueue/tests/{ => it}/sqs.rs (99%) diff --git a/omniqueue/tests/gcp_pubsub.rs b/omniqueue/tests/it/gcp_pubsub.rs similarity index 99% rename from omniqueue/tests/gcp_pubsub.rs rename to omniqueue/tests/it/gcp_pubsub.rs index b53cf36..51022e9 100644 --- a/omniqueue/tests/gcp_pubsub.rs +++ b/omniqueue/tests/it/gcp_pubsub.rs @@ -1,5 +1,3 @@ -#![cfg(feature = "gcp_pubsub")] - //! Support for Google Cloud Pub/Sub. //! //! In this system subscriptions are like queue bindings to topics. diff --git a/omniqueue/tests/it/main.rs b/omniqueue/tests/it/main.rs new file mode 100644 index 0000000..a9c8571 --- /dev/null +++ b/omniqueue/tests/it/main.rs @@ -0,0 +1,10 @@ +#[cfg(feature = "gcp_pubsub")] +mod gcp_pubsub; +#[cfg(feature = "rabbitmq")] +mod rabbitmq; +#[cfg(feature = "redis")] +mod redis; +#[cfg(feature = "redis_cluster")] +mod redis_cluster; +#[cfg(feature = "sqs")] +mod sqs; diff --git a/omniqueue/tests/rabbitmq.rs b/omniqueue/tests/it/rabbitmq.rs similarity index 99% rename from omniqueue/tests/rabbitmq.rs rename to omniqueue/tests/it/rabbitmq.rs index 4d5315c..d5e44f0 100644 --- a/omniqueue/tests/rabbitmq.rs +++ b/omniqueue/tests/it/rabbitmq.rs @@ -1,5 +1,3 @@ -#![cfg(feature = "rabbitmq")] - use lapin::options::ExchangeDeclareOptions; use lapin::types::AMQPValue; use lapin::{ diff --git a/omniqueue/tests/redis.rs b/omniqueue/tests/it/redis.rs similarity index 99% rename from omniqueue/tests/redis.rs rename to omniqueue/tests/it/redis.rs index 242bef1..3e2c546 100644 --- a/omniqueue/tests/redis.rs +++ b/omniqueue/tests/it/redis.rs @@ -1,5 +1,3 @@ -#![cfg(feature = "redis")] - use omniqueue::{ backends::redis::{RedisConfig, RedisQueueBackend}, queue::{consumer::QueueConsumer, producer::QueueProducer, QueueBackend, QueueBuilder, Static}, diff --git a/omniqueue/tests/redis_cluster.rs b/omniqueue/tests/it/redis_cluster.rs similarity index 99% rename from omniqueue/tests/redis_cluster.rs rename to omniqueue/tests/it/redis_cluster.rs index 8bd26b9..a4c2ecd 100644 --- a/omniqueue/tests/redis_cluster.rs +++ b/omniqueue/tests/it/redis_cluster.rs @@ -1,5 +1,3 @@ -#![cfg(feature = "redis_cluster")] - use omniqueue::{ backends::redis::{RedisClusterQueueBackend, RedisConfig}, queue::{consumer::QueueConsumer, producer::QueueProducer, QueueBackend, QueueBuilder, Static}, diff --git a/omniqueue/tests/sqs.rs b/omniqueue/tests/it/sqs.rs similarity index 99% rename from omniqueue/tests/sqs.rs rename to omniqueue/tests/it/sqs.rs index 35cfa4e..54987c0 100644 --- a/omniqueue/tests/sqs.rs +++ b/omniqueue/tests/it/sqs.rs @@ -1,5 +1,3 @@ -#![cfg(feature = "sqs")] - use aws_sdk_sqs::Client; use omniqueue::{ backends::sqs::{SqsConfig, SqsQueueBackend},