Skip to content

Commit 9d6a45e

Browse files
committed
fix flaky tests due to a blank database name, which fails in the test creator
1 parent 0792764 commit 9d6a45e

2 files changed

Lines changed: 26 additions & 2 deletions

File tree

operator/src/test/java/it/aboutbits/postgresql/_support/testdata/persisted/creator/DefaultPrivilegeCreate.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,23 @@ private String getSchema() {
234234
return withSchema;
235235
}
236236

237+
var databaseName = getDatabase();
238+
if (databaseName.isBlank()) {
239+
databaseName = given.one()
240+
.database()
241+
.withClusterConnectionName(getClusterConnectionName())
242+
.withClusterConnectionNamespace(withClusterConnectionNamespace)
243+
.withReclaimPolicy(DELETE)
244+
.returnFirst()
245+
.getSpec()
246+
.getName();
247+
}
248+
237249
var clusterConnectionDb = given.one()
238250
.clusterConnection()
239251
.withName(getClusterConnectionName() + "-db")
240252
.withNamespace(withClusterConnectionNamespace)
241-
.withDatabase(getDatabase())
253+
.withDatabase(databaseName)
242254
.returnFirst();
243255

244256
var item = given.one()

operator/src/test/java/it/aboutbits/postgresql/_support/testdata/persisted/creator/GrantCreate.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,23 @@ private String getSchema() {
236236
return withSchema;
237237
}
238238

239+
var databaseName = getDatabase();
240+
if (databaseName.isBlank()) {
241+
databaseName = given.one()
242+
.database()
243+
.withClusterConnectionName(getClusterConnectionName())
244+
.withClusterConnectionNamespace(withClusterConnectionNamespace)
245+
.withReclaimPolicy(DELETE)
246+
.returnFirst()
247+
.getSpec()
248+
.getName();
249+
}
250+
239251
var clusterConnectionDb = given.one()
240252
.clusterConnection()
241253
.withName(getClusterConnectionName() + "-db")
242254
.withNamespace(withClusterConnectionNamespace)
243-
.withDatabase(getDatabase())
255+
.withDatabase(databaseName)
244256
.returnFirst();
245257

246258
var item = given.one()

0 commit comments

Comments
 (0)