Merge pull request #730 from wprzytula/integration-tests-single-binary

Integration tests single binary

Author: piodul

scylla/tests/execution_profiles.rs renamed to scylla/tests/integration/execution_profiles.rs

@@ -1,8 +1,7 @@
-mod utils;
-
 use std::ops::Deref;
 use std::sync::Arc;
 
+use crate::utils::test_with_3_node_cluster;
 use assert_matches::assert_matches;
 use scylla::batch::BatchStatement;
 use scylla::batch::{Batch, BatchType};
@@ -20,7 +19,6 @@ use scylla::{
 };
 use scylla_cql::Consistency;
 use tokio::sync::mpsc;
-use utils::test_with_3_node_cluster;
 
 use scylla_proxy::{
     Condition, ProxyError, RequestReaction, RequestRule, ShardAwareness, WorkerError,

scylla/tests/hygiene.rs renamed to scylla/tests/integration/hygiene.rs

@@ -1,13 +1,11 @@
-mod utils;
-
+use crate::utils::test_with_3_node_cluster;
 use scylla::frame::types;
 use scylla::retry_policy::FallthroughRetryPolicy;
 use scylla::transport::session::Session;
 use scylla::{frame::protocol_features::ProtocolFeatures, test_utils::unique_keyspace_name};
 use scylla::{ExecutionProfile, SessionBuilder};
 use std::sync::Arc;
 use tokio::sync::mpsc;
-use utils::test_with_3_node_cluster;
 
 use scylla_proxy::{
     Condition, ProxyError, Reaction, RequestFrame, RequestOpcode, RequestReaction, RequestRule,

scylla/tests/lwt_optimisation.rs renamed to scylla/tests/integration/lwt_optimisation.rs

@@ -0,0 +1,5 @@
+mod execution_profiles;
+mod hygiene;
+mod lwt_optimisation;
+mod retries;
+pub(crate) mod utils;

scylla/tests/integration/main.rs

@@ -1,5 +1,4 @@
-mod utils;
-
+use crate::utils::test_with_3_node_cluster;
 use scylla::retry_policy::FallthroughRetryPolicy;
 use scylla::speculative_execution::SimpleSpeculativeExecutionPolicy;
 use scylla::transport::session::Session;
@@ -9,7 +8,6 @@ use scylla::{query::Query, test_utils::unique_keyspace_name};
 use std::sync::Arc;
 use std::time::Duration;
 use tracing::info;
-use utils::test_with_3_node_cluster;
 
 use scylla_proxy::{
     Condition, ProxyError, Reaction, RequestOpcode, RequestReaction, RequestRule, ShardAwareness,