diff --git a/crates/storage-cassandra/tests/direct_integration.rs b/crates/storage-cassandra/tests/direct_integration.rs index 863bbda69..4403658ab 100644 --- a/crates/storage-cassandra/tests/direct_integration.rs +++ b/crates/storage-cassandra/tests/direct_integration.rs @@ -4,8 +4,9 @@ //! Direct storage-trait integration tests, ported from the original //! extenddb-cassandra-plugin repository (its tests/rust suite). They exercise //! the Cassandra engine's trait implementations directly against a live node -//! at 127.0.0.1:9042 — no HTTP server in between — and skip themselves when -//! no Cassandra is reachable (see helpers::skip_without_cassandra). +//! at the contact point in `EXTENDDB_TEST_CASSANDRA_CONTACT_POINT` (default +//! 127.0.0.1:9042) — no HTTP server in between — and skip themselves when no +//! Cassandra is reachable (see helpers::skip_without_cassandra). //! //! One binary, one module per area, sharing tests/common/mod.rs, which is the //! in-tree descendant of the plug-in repo's helpers.rs. diff --git a/crates/storage-cassandra/tests/ttl_integration.rs b/crates/storage-cassandra/tests/ttl_integration.rs index 4b1f4230c..e97ef7ad4 100644 --- a/crates/storage-cassandra/tests/ttl_integration.rs +++ b/crates/storage-cassandra/tests/ttl_integration.rs @@ -3,8 +3,9 @@ //! Integration tests for Cassandra TTL against a live Cassandra. //! -//! Requires Cassandra on 127.0.0.1:9042. There is no Cassandra CI workflow, so -//! these are run locally. +//! Requires Cassandra at the contact point in +//! `EXTENDDB_TEST_CASSANDRA_CONTACT_POINT` (default 127.0.0.1:9042). The +//! integration-cassandra workflow runs these against a service container. #[path = "common/mod.rs"] mod helpers; diff --git a/devtools/run-cassandra-tests b/devtools/run-cassandra-tests index 962e43c58..5d77851b1 100755 --- a/devtools/run-cassandra-tests +++ b/devtools/run-cassandra-tests @@ -29,8 +29,10 @@ # # Prerequisites: # - A Cassandra node reachable at the contact point (default 127.0.0.1:9042) -# with PasswordAuthenticator enabled. The official cassandra:4.1 image does -# not honour CASSANDRA_AUTHENTICATOR, so patch it after starting: +# with PasswordAuthenticator enabled. The Rust direct tests read +# EXTENDDB_TEST_CASSANDRA_CONTACT_POINT (default 127.0.0.1:9042), which +# --contact-points above doesn't set. The official cassandra:4.1 image +# does not honour CASSANDRA_AUTHENTICATOR, so patch it after starting: # docker run -d --name cassandra -p 127.0.0.1:9042:9042 \ # -e CASSANDRA_CLUSTER_NAME=extenddb-ci \ # -e HEAP_NEWSIZE=128M -e MAX_HEAP_SIZE=1024M \ @@ -67,7 +69,7 @@ while [[ $# -gt 0 ]]; do --output) OUTPUT_DIR="$2"; shift 2 ;; --keep) KEEP=true; shift ;; --) shift; RUN_TESTS_ARGS=("$@"); break ;; - -h|--help) sed -n '5,35p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;; + -h|--help) sed -n '5,47p' "$0" | sed 's/^# \{0,1\}//'; exit 0 ;; *) echo "error: unknown option: $1" >&2; exit 1 ;; esac done