Integration tests: Move to new utils

Author: Lorak-mmk

scylla/src/lib.rs

@@ -257,10 +257,8 @@ pub mod transport;
 
 pub(crate) mod utils;
 
-/// This module is NOT part of the public API (it is `pub` only for internal use of integration tests).
-/// Future minor releases are free to introduce breaking API changes inside it.
-#[doc(hidden)]
-pub use utils::test_utils;
+#[cfg(test)]
+pub(crate) use utils::test_utils;
 
 pub use statement::batch;
 pub use statement::prepared_statement;

scylla/src/utils/mod.rs

@@ -1,4 +1,6 @@
 pub(crate) mod parse;
 
 pub(crate) mod pretty;
-pub mod test_utils;
+
+#[cfg(test)]
+pub(crate) mod test_utils;

scylla/src/utils/test_utils.rs

@@ -1,9 +1,6 @@
-use scylla_cql::frame::response::result::Row;
-
-#[cfg(test)]
 use crate::transport::session_builder::{GenericSessionBuilder, SessionBuilderKind};
 use crate::Session;
-#[cfg(test)]
+use scylla_cql::frame::response::result::Row;
 use std::{num::NonZeroU32, time::Duration};
 use std::{
     sync::atomic::{AtomicUsize, Ordering},
@@ -12,7 +9,7 @@ use std::{
 
 static UNIQUE_COUNTER: AtomicUsize = AtomicUsize::new(0);
 
-pub fn unique_keyspace_name() -> String {
+pub(crate) fn unique_keyspace_name() -> String {
     let cnt = UNIQUE_COUNTER.fetch_add(1, Ordering::SeqCst);
     let name = format!(
         "test_rust_{}_{}",
@@ -26,7 +23,6 @@ pub fn unique_keyspace_name() -> String {
     name
 }
 
-#[cfg(test)]
 pub(crate) async fn supports_feature(session: &Session, feature: &str) -> bool {
     // Cassandra doesn't have a concept of features, so first detect
     // if there is the `supported_features` column in system.local
@@ -62,8 +58,7 @@ pub(crate) async fn supports_feature(session: &Session, feature: &str) -> bool {
 // Creates a generic session builder based on conditional compilation configuration
 // For SessionBuilder of DefaultMode type, adds localhost to known hosts, as all of the tests
 // connect to localhost.
-#[cfg(test)]
-pub fn create_new_session_builder() -> GenericSessionBuilder<impl SessionBuilderKind> {
+pub(crate) fn create_new_session_builder() -> GenericSessionBuilder<impl SessionBuilderKind> {
     let session_builder = {
         #[cfg(not(scylla_cloud_tests))]
         {
@@ -96,7 +91,7 @@ pub fn create_new_session_builder() -> GenericSessionBuilder<impl SessionBuilder
         .tracing_info_fetch_interval(Duration::from_millis(50))
 }
 
-pub async fn scylla_supports_tablets(session: &Session) -> bool {
+pub(crate) async fn scylla_supports_tablets(session: &Session) -> bool {
     let result = session
         .query_unpaged(
             "select column_name from system_schema.columns where
@@ -112,7 +107,6 @@ pub async fn scylla_supports_tablets(session: &Session) -> bool {
     result.is_ok_and(|rows_result| rows_result.single_row::<Row>().is_ok())
 }
 
-#[cfg(test)]
 pub(crate) fn setup_tracing() {
     let _ = tracing_subscriber::fmt::fmt()
         .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())

scylla/tests/integration/consistency.rs

@@ -1,11 +1,11 @@
 use crate::utils::{setup_tracing, test_with_3_node_cluster};
 
+use crate::utils::unique_keyspace_name;
 use scylla::execution_profile::{ExecutionProfileBuilder, ExecutionProfileHandle};
 use scylla::load_balancing::{DefaultPolicy, LoadBalancingPolicy, RoutingInfo};
 use scylla::prepared_statement::PreparedStatement;
 use scylla::retry_policy::FallthroughRetryPolicy;
 use scylla::routing::{Shard, Token};
-use scylla::test_utils::unique_keyspace_name;
 use scylla::transport::NodeRef;
 use scylla::Session;
 use scylla_cql::frame::response::result::TableSpec;

scylla/tests/integration/execution_profiles.rs

@@ -1,7 +1,7 @@
 use std::ops::Deref;
 use std::sync::Arc;
 
-use crate::utils::{setup_tracing, test_with_3_node_cluster};
+use crate::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name};
 use assert_matches::assert_matches;
 use scylla::batch::BatchStatement;
 use scylla::batch::{Batch, BatchType};
@@ -13,7 +13,6 @@ use scylla::{
     load_balancing::{LoadBalancingPolicy, RoutingInfo},
     retry_policy::{RetryPolicy, RetrySession},
     speculative_execution::SpeculativeExecutionPolicy,
-    test_utils::unique_keyspace_name,
     transport::ClusterData,
     ExecutionProfile, SessionBuilder,
 };

scylla/tests/integration/lwt_optimisation.rs

@@ -1,7 +1,7 @@
-use crate::utils::{setup_tracing, test_with_3_node_cluster};
+use crate::utils::{
+    scylla_supports_tablets, setup_tracing, test_with_3_node_cluster, unique_keyspace_name,
+};
 use scylla::retry_policy::FallthroughRetryPolicy;
-use scylla::test_utils::scylla_supports_tablets;
-use scylla::test_utils::unique_keyspace_name;
 use scylla::transport::session::Session;
 use scylla::{ExecutionProfile, SessionBuilder};
 use scylla_cql::frame::protocol_features::ProtocolFeatures;

scylla/tests/integration/retries.rs

@@ -1,10 +1,10 @@
-use crate::utils::{setup_tracing, test_with_3_node_cluster};
+use crate::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name};
+use scylla::query::Query;
 use scylla::retry_policy::FallthroughRetryPolicy;
 use scylla::speculative_execution::SimpleSpeculativeExecutionPolicy;
 use scylla::transport::session::Session;
 use scylla::ExecutionProfile;
 use scylla::SessionBuilder;
-use scylla::{query::Query, test_utils::unique_keyspace_name};
 use std::sync::Arc;
 use std::time::Duration;
 use tracing::info;

scylla/tests/integration/shards.rs

@@ -1,8 +1,9 @@
 use std::sync::Arc;
 
-use crate::utils::{setup_tracing, test_with_3_node_cluster};
-use scylla::test_utils::scylla_supports_tablets;
-use scylla::{test_utils::unique_keyspace_name, SessionBuilder};
+use crate::utils::{
+    scylla_supports_tablets, setup_tracing, test_with_3_node_cluster, unique_keyspace_name,
+};
+use scylla::SessionBuilder;
 use tokio::sync::mpsc;
 
 use scylla_proxy::TargetShard;

scylla/tests/integration/silent_prepare_query.rs

@@ -1,7 +1,7 @@
-use crate::utils::{setup_tracing, test_with_3_node_cluster};
+use crate::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name};
+use scylla::query::Query;
 use scylla::Session;
 use scylla::SessionBuilder;
-use scylla::{query::Query, test_utils::unique_keyspace_name};
 use scylla_proxy::{
     Condition, ProxyError, Reaction, RequestOpcode, RequestReaction, RequestRule, ShardAwareness,
     WorkerError,

scylla/tests/integration/skip_metadata_optimization.rs

@@ -1,5 +1,5 @@
-use crate::utils::{setup_tracing, test_with_3_node_cluster};
-use scylla::{prepared_statement::PreparedStatement, test_utils::unique_keyspace_name};
+use crate::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name};
+use scylla::prepared_statement::PreparedStatement;
 use scylla::{Session, SessionBuilder};
 use scylla_cql::frame::request::query::{PagingState, PagingStateResponse};
 use scylla_cql::frame::types;