Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions scylla-rust-wrapper/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions scylla-rust-wrapper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
rust-version = "1.88"

[dependencies]
scylla = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "9ab7216d4d32eb249dbd9929c9d3592711b800da", features = [
scylla = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "v1.8.0", features = [
"openssl-010",
"metrics",
"unstable-cpp-rs",
Expand All @@ -38,9 +38,9 @@ bindgen = "0.65"
chrono = "0.4.20"

[dev-dependencies]
scylla-proxy = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "9ab7216d4d32eb249dbd9929c9d3592711b800da" }
scylla-cql = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "9ab7216d4d32eb249dbd9929c9d3592711b800da" }
scylla-ccm-bridge = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "9ab7216d4d32eb249dbd9929c9d3592711b800da" }
scylla-proxy = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "v1.8.0" }
scylla-cql = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "v1.8.0" }
scylla-ccm-bridge = { git = "https://github.com/scylladb/scylla-rust-driver.git", rev = "v1.8.0" }
bytes = "1.10.0"
itertools = "0.10.3"
assert_matches = "1.5.0"
Expand Down
10 changes: 7 additions & 3 deletions tests/src/integration/tests/test_control_connection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionTests, ConnectUsingInvalidIpAddres
CHECK_FAILURE;

// Attempt to connect to the server using an invalid IP address
logger_.add_critera("Could not fetch metadata, error: "
logger_.add_critera("Failed to establish control connection, "
"control_connection_address: 1.1.1.1:9042, error: "
"Control connection pool error: The pool is broken; "
"Last connection failed with: Connect timeout elapsed");
Cluster cluster = Cluster::build().with_contact_points("1.1.1.1");
Expand Down Expand Up @@ -204,7 +205,9 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionTests, ConnectUsingUnbindableLocal
CHECK_FAILURE;

// Attempt to connect to the server using an unbindable local IP address
logger_.add_critera("Could not fetch metadata, error: "
logger_.add_critera("Failed to establish control connection, "
"control_connection_address: " + ccm_->get_ip_prefix() +
"1:9042, error: "
"Control connection pool error: The pool is broken; "
"Last connection failed with: Cannot assign requested address");
Cluster cluster = default_cluster().with_local_address("1.1.1.1");
Expand Down Expand Up @@ -236,7 +239,8 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionTests,
// Attempt to connect to the server using an valid local IP address
// but invalid remote address. The specified remote is not routable
// from the specified local.
logger_.add_critera("Could not fetch metadata, error: "
logger_.add_critera("Failed to establish control connection, "
"control_connection_address: 1.1.1.1:9042, error: "
"Control connection pool error: The pool is broken; "
"Last connection failed with: Invalid argument");
Cluster cluster = Cluster::build().with_contact_points("1.1.1.1").with_local_address("127.0.0.1");
Expand Down
Loading