Skip to content

Commit 737fa87

Browse files
committed
Test adjustments subsequent to buildkite changes from I4c9eac4d
It's probably safer to revert most of the authority changes. Also one test started itself in a unique way that passed no dialect. Change-Id: I9bc04355750abcb094f3e646e07c9690311d2a20 Reviewed-on: https://gerrit.readyset.name/c/readyset/+/10221 Tested-by: Buildkite CI Reviewed-by: Jason Brown <jason.b@readyset.io>
1 parent c64c07a commit 737fa87

File tree

8 files changed

+13
-5
lines changed

8 files changed

+13
-5
lines changed

build/docker-compose.ci-mysql57.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ services:
99
depends_on:
1010
- mysql
1111
environment:
12+
- AUTHORITY=standalone
1213
- ALLOW_UNAUTHENTICATED_CONNECTIONS=true
1314
- MYSQL_HOST=mysql

build/docker-compose.ci-mysql80.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ services:
88
depends_on:
99
- mysql
1010
environment:
11+
- AUTHORITY=standalone
1112
- ALLOW_UNAUTHENTICATED_CONNECTIONS=true
1213
- MYSQL_HOST=mysql

build/docker-compose.ci-mysql84.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ services:
88
depends_on:
99
- mysql
1010
environment:
11+
- AUTHORITY=standalone
1112
- ALLOW_UNAUTHENTICATED_CONNECTIONS=true
1213
- MYSQL_HOST=mysql

build/docker-compose.ci-postgis-15.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ services:
1212
depends_on:
1313
- postgres
1414
environment:
15+
- AUTHORITY=standalone
1516
- ALLOW_UNAUTHENTICATED_CONNECTIONS=true
1617
- POSTGRESQL_HOST=postgres
1718
- PGHOST=postgres

build/docker-compose.ci-postgres13.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ services:
1212
depends_on:
1313
- postgres
1414
environment:
15+
- AUTHORITY=standalone
1516
- ALLOW_UNAUTHENTICATED_CONNECTIONS=true
1617
- POSTGRESQL_HOST=postgres
1718
- PGHOST=postgres

build/docker-compose.ci-postgres15.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ services:
1212
depends_on:
1313
- postgres
1414
environment:
15+
- AUTHORITY=standalone
1516
- ALLOW_UNAUTHENTICATED_CONNECTIONS=true
1617
- POSTGRESQL_HOST=postgres
1718
- PGHOST=postgres

readyset-server/src/controller/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ impl ControllerState {
139139
config
140140
.replicator_config
141141
.get_cdc_db_url()
142-
.expect("Failed to get CDC database URL")
142+
.expect("Failed to get CDC database URL; provide URL or explicit dialect")
143143
.database_type()
144144
.into()
145145
})

replicators/tests/tests.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,17 +329,18 @@ impl TestHandle {
329329
mut builder: Builder,
330330
) -> ReadySetResult<(TestHandle, ShutdownSender)> {
331331
readyset_tracing::init_test_logging();
332+
332333
let persistence = readyset_server::PersistenceParameters {
333334
mode: readyset_server::DurabilityMode::DeleteOnExit,
334335
..Default::default()
335336
};
336337
builder.set_persistence(persistence);
338+
337339
let parsing_preset = builder.parsing_preset;
338340
let telemetry_sender = builder.telemetry.clone();
339341
let (noria, shutdown_tx) = builder.start(Arc::clone(&authority)).await.unwrap();
340342

341343
let dialect = data_dialect_from_url(&url);
342-
343344
let mut handle = TestHandle {
344345
url,
345346
dialect,
@@ -2082,16 +2083,16 @@ async fn postgresql_ddl_replicate_create_view_internal(url: &str) {
20822083
#[tokio::test(flavor = "multi_thread")]
20832084
#[tags(serial, slow, mysql_upstream)]
20842085
async fn snapshot_telemetry_mysql() {
2085-
snapshot_telemetry_inner(&mysql_url()).await
2086+
snapshot_telemetry_inner(readyset_sql::Dialect::MySQL, &mysql_url()).await
20862087
}
20872088

20882089
#[tokio::test(flavor = "multi_thread")]
20892090
#[tags(serial, slow, postgres_upstream)]
20902091
async fn snapshot_telemetry_postgresql() {
2091-
snapshot_telemetry_inner(&pgsql_url()).await
2092+
snapshot_telemetry_inner(readyset_sql::Dialect::PostgreSQL, &pgsql_url()).await
20922093
}
20932094

2094-
async fn snapshot_telemetry_inner(url: &String) {
2095+
async fn snapshot_telemetry_inner(dialect: readyset_sql::Dialect, url: &String) {
20952096
readyset_tracing::init_test_logging();
20962097
let mut client = DbConnection::connect(url).await.unwrap();
20972098
client.query(CREATE_SCHEMA).await.unwrap();
@@ -2100,6 +2101,7 @@ async fn snapshot_telemetry_inner(url: &String) {
21002101
let (sender, mut reporter) = TelemetryInitializer::test_init();
21012102
let mut builder = Builder::for_tests();
21022103
builder.set_telemetry_sender(sender);
2104+
builder.set_dialect(dialect);
21032105
let (mut ctx, shutdown_tx) =
21042106
TestHandle::start_noria_with_builder(url.to_string(), None, builder)
21052107
.await

0 commit comments

Comments
 (0)