Dm/folder structure

scylla/tests/common/mod.rs

@@ -1 +1,4 @@
 pub(crate) mod utils;
+
+#[allow(unused_imports)]
+pub(crate) use utils::*;

scylla/tests/integration/authenticate.rs

@@ -1,4 +1,4 @@
-use crate::utils::{setup_tracing, unique_keyspace_name, PerformDDL};
+use crate::common::utils::{setup_tracing, unique_keyspace_name, PerformDDL};
 use async_trait::async_trait;
 use bytes::{BufMut, BytesMut};
 use scylla::authentication::{AuthError, AuthenticatorProvider, AuthenticatorSession};

scylla/tests/integration/batch.rs

@@ -5,10 +5,10 @@ use scylla::frame::frame_errors::BatchSerializationError;
 use scylla::frame::frame_errors::CqlRequestSerializationError;
 use scylla::query::Query;
 
-use crate::utils::create_new_session_builder;
-use crate::utils::setup_tracing;
-use crate::utils::unique_keyspace_name;
-use crate::utils::PerformDDL;
+use crate::common::utils::create_new_session_builder;
+use crate::common::utils::setup_tracing;
+use crate::common::utils::unique_keyspace_name;
+use crate::common::utils::PerformDDL;
 
 use assert_matches::assert_matches;
 

scylla/tests/integration/consistency.rs

@@ -1,4 +1,4 @@
-use crate::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name, PerformDDL};
+use crate::common::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name, PerformDDL};
 use scylla::client::execution_profile::{ExecutionProfileBuilder, ExecutionProfileHandle};
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;

scylla/tests/integration/cql_collections.rs

@@ -1,4 +1,4 @@
-use crate::utils::{
+use crate::common::utils::{
     create_new_session_builder, setup_tracing, unique_keyspace_name, DeserializeOwnedValue,
     PerformDDL,
 };

scylla/tests/integration/cql_types.rs

@@ -8,7 +8,7 @@ use std::fmt::Debug;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 use std::str::FromStr;
 
-use crate::utils::{
+use crate::common::utils::{
     create_new_session_builder, scylla_supports_tablets, setup_tracing, unique_keyspace_name,
     DeserializeOwnedValue, PerformDDL,
 };

scylla/tests/integration/cql_value.rs

@@ -3,7 +3,7 @@ use assert_matches::assert_matches;
 use scylla::client::session::Session;
 use scylla::value::{CqlDuration, CqlValue};
 
-use crate::utils::{create_new_session_builder, setup_tracing, unique_keyspace_name, PerformDDL};
+use crate::common::utils::{create_new_session_builder, setup_tracing, unique_keyspace_name, PerformDDL};
 
 #[tokio::test]
 async fn test_cqlvalue_udt() {

scylla/tests/integration/default_policy.rs

@@ -1,7 +1,7 @@
 use scylla::client::execution_profile::ExecutionProfile;
 use scylla::policies::load_balancing::{DefaultPolicy, LatencyAwarenessBuilder};
 
-use crate::utils::{create_new_session_builder, setup_tracing};
+use crate::common::utils::{create_new_session_builder, setup_tracing};
 
 // This is a regression test for #696.
 #[tokio::test]

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, unique_keyspace_name, PerformDDL};
+use crate::common::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name, PerformDDL};
 use assert_matches::assert_matches;
 use scylla::batch::{Batch, BatchStatement, BatchType};
 use scylla::client::execution_profile::ExecutionProfile;

scylla/tests/integration/history.rs

@@ -10,7 +10,7 @@ use scylla::observability::history::{
 use scylla::query::Query;
 use scylla::value::Row;
 
-use crate::utils::{create_new_session_builder, setup_tracing, unique_keyspace_name, PerformDDL};
+use crate::common::utils::{create_new_session_builder, setup_tracing, unique_keyspace_name, PerformDDL};
 
 // Set a single time for all timestamps within StructuredHistory.
 // HistoryCollector sets the timestamp to current time which changes with each test.

scylla/tests/integration/hygiene.rs

@@ -36,7 +36,7 @@ macro_rules! test_crate {
         }
         #[test]
         fn test_row_ser_deser() {
-            use crate::utils::setup_tracing;
+            use crate::common::utils::setup_tracing;
             use ::bytes::Bytes;
             use ::core::primitive::u8;
             use ::std::assert_eq;
@@ -102,7 +102,7 @@ macro_rules! test_crate {
 
         #[test]
         fn test_value_ser_deser() {
-            use crate::utils::setup_tracing;
+            use crate::common::utils::setup_tracing;
             use ::bytes::Bytes;
             use ::core::primitive::u8;
             use ::std::assert_eq;

scylla/tests/integration/large_batch_statements.rs

@@ -1,7 +1,7 @@
 use assert_matches::assert_matches;
 use scylla::client::session::Session;
 
-use crate::utils::{create_new_session_builder, setup_tracing, unique_keyspace_name, PerformDDL};
+use crate::common::utils::{create_new_session_builder, setup_tracing, unique_keyspace_name, PerformDDL};
 use scylla::batch::Batch;
 use scylla::batch::BatchType;
 use scylla::errors::{BadQuery, ExecutionError};

scylla/tests/integration/lwt_optimisation.rs

@@ -1,4 +1,4 @@
-use crate::utils::{
+use crate::common::utils::{
     scylla_supports_tablets, setup_tracing, test_with_3_node_cluster, unique_keyspace_name,
     PerformDDL,
 };

scylla/tests/integration/main.rs

@@ -18,5 +18,5 @@ mod silent_prepare_batch;
 mod silent_prepare_query;
 mod skip_metadata_optimization;
 mod tablets;
-#[path = "../common/utils.rs"]
-mod utils;
+#[path = "../common/mod.rs"]
+mod common;

scylla/tests/integration/new_session.rs

@@ -1,4 +1,4 @@
-use crate::utils::setup_tracing;
+use crate::common::utils::setup_tracing;
 
 use assert_matches::assert_matches;
 use scylla::client::session_builder::SessionBuilder;

scylla/tests/integration/retries.rs

@@ -1,4 +1,4 @@
-use crate::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name, PerformDDL};
+use crate::common::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name, PerformDDL};
 use scylla::client::execution_profile::ExecutionProfile;
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;

scylla/tests/integration/self_identity.rs

@@ -1,4 +1,4 @@
-use crate::utils::{setup_tracing, test_with_3_node_cluster};
+use crate::common::utils::{setup_tracing, test_with_3_node_cluster};
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;
 use scylla::client::SelfIdentity;

scylla/tests/integration/shards.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use std::sync::Arc;
 
-use crate::utils::{
+use crate::common::utils::{
     scylla_supports_tablets, setup_tracing, test_with_3_node_cluster, unique_keyspace_name,
     PerformDDL,
 };

scylla/tests/integration/silent_prepare_batch.rs

@@ -1,4 +1,4 @@
-use crate::utils::{create_new_session_builder, setup_tracing, unique_keyspace_name, PerformDDL};
+use crate::common::utils::{create_new_session_builder, setup_tracing, unique_keyspace_name, PerformDDL};
 use scylla::batch::Batch;
 use scylla::client::session::Session;
 use scylla::prepared_statement::PreparedStatement;

scylla/tests/integration/silent_prepare_query.rs

@@ -1,4 +1,4 @@
-use crate::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name, PerformDDL};
+use crate::common::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name, PerformDDL};
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;
 use scylla::query::Query;

scylla/tests/integration/skip_metadata_optimization.rs

@@ -1,4 +1,4 @@
-use crate::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name, PerformDDL};
+use crate::common::utils::{setup_tracing, test_with_3_node_cluster, unique_keyspace_name, PerformDDL};
 use scylla::prepared_statement::PreparedStatement;
 use scylla_cql::frame::request::query::{PagingState, PagingStateResponse};
 use scylla_cql::frame::types;

scylla/tests/integration/tablets.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use crate::utils::{
+use crate::common::utils::{
     scylla_supports_tablets, setup_tracing, test_with_3_node_cluster, unique_keyspace_name,
     PerformDDL,
 };