Skip to content

Commit 3b2963b

Browse files
committed
default policy: Move some tests to integration
1 parent d8a06b7 commit 3b2963b

File tree

3 files changed

+28
-24
lines changed

3 files changed

+28
-24
lines changed

scylla/src/transport/load_balancing/default.rs

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3128,7 +3128,7 @@ mod latency_awareness {
31283128
use crate::{
31293129
load_balancing::default::NodeLocationPreference,
31303130
routing::Shard,
3131-
test_utils::{create_new_session_builder, setup_tracing},
3131+
test_utils::setup_tracing,
31323132
transport::locator::test::{TABLE_INVALID, TABLE_NTS_RF_2, TABLE_NTS_RF_3},
31333133
};
31343134
use crate::{
@@ -3141,7 +3141,6 @@ mod latency_awareness {
31413141
locator::test::{id_to_invalid_addr, A, B, C, D, E, F, G},
31423142
ClusterData, NodeAddr,
31433143
},
3144-
ExecutionProfile,
31453144
};
31463145
use tokio::time::Instant;
31473146

@@ -3847,28 +3846,6 @@ mod latency_awareness {
38473846
}
38483847
}
38493848

3850-
// This is a regression test for #696.
3851-
#[tokio::test]
3852-
#[ntest::timeout(1000)]
3853-
async fn latency_aware_query_completes() {
3854-
setup_tracing();
3855-
let policy = DefaultPolicy::builder()
3856-
.latency_awareness(LatencyAwarenessBuilder::default())
3857-
.build();
3858-
let handle = ExecutionProfile::builder()
3859-
.load_balancing_policy(policy)
3860-
.build()
3861-
.into_handle();
3862-
3863-
let session = create_new_session_builder()
3864-
.default_execution_profile_handle(handle)
3865-
.build()
3866-
.await
3867-
.unwrap();
3868-
3869-
session.query_unpaged("whatever", ()).await.unwrap_err();
3870-
}
3871-
38723849
#[tokio::test(start_paused = true)]
38733850
async fn timestamped_average_works_when_clock_stops() {
38743851
setup_tracing();
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
use scylla::load_balancing::{DefaultPolicy, LatencyAwarenessBuilder};
2+
use scylla::ExecutionProfile;
3+
4+
use crate::utils::{create_new_session_builder, setup_tracing};
5+
6+
// This is a regression test for #696.
7+
#[tokio::test]
8+
#[ntest::timeout(1000)]
9+
async fn latency_aware_query_completes() {
10+
setup_tracing();
11+
let policy = DefaultPolicy::builder()
12+
.latency_awareness(LatencyAwarenessBuilder::default())
13+
.build();
14+
let handle = ExecutionProfile::builder()
15+
.load_balancing_policy(policy)
16+
.build()
17+
.into_handle();
18+
19+
let session = create_new_session_builder()
20+
.default_execution_profile_handle(handle)
21+
.build()
22+
.await
23+
.unwrap();
24+
25+
session.query_unpaged("whatever", ()).await.unwrap_err();
26+
}

scylla/tests/integration/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ mod consistency;
33
mod cql_collections;
44
mod cql_types;
55
mod cql_value;
6+
mod default_policy;
67
mod execution_profiles;
78
mod history;
89
mod hygiene;

0 commit comments

Comments
 (0)