Skip to content

Commit 2f65f62

Browse files
committed
split TestEmbedded to 3 separate tests to allow run it parallel
1 parent 1c9d907 commit 2f65f62

File tree

1 file changed

+23
-1
lines changed

1 file changed

+23
-1
lines changed

test/integration/integration_test.go

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ func TestChangeReplicationPathIfReplicaExists(t *testing.T) {
678678
env.Cleanup(t, r)
679679
}
680680

681-
func TestEmbedded(t *testing.T) {
681+
func TestEmbeddedAzure(t *testing.T) {
682682
version := os.Getenv("CLICKHOUSE_VERSION")
683683
if compareVersion(version, "23.3") < 0 {
684684
t.Skipf("Test skipped, BACKUP/RESTORE not production ready for %s version, look https://github.com/ClickHouse/ClickHouse/issues/39416 for details", version)
@@ -694,6 +694,17 @@ func TestEmbedded(t *testing.T) {
694694
env.runMainIntegrationScenario(t, "EMBEDDED_AZURE_URL", "config-azblob-embedded-url.yml")
695695
}
696696

697+
env.Cleanup(t, r)
698+
}
699+
700+
func TestEmbeddedGCSOverS3(t *testing.T) {
701+
version := os.Getenv("CLICKHOUSE_VERSION")
702+
if compareVersion(version, "23.3") < 0 {
703+
t.Skipf("Test skipped, BACKUP/RESTORE not production ready for %s version, look https://github.com/ClickHouse/ClickHouse/issues/39416 for details", version)
704+
}
705+
t.Logf("@TODO RESTORE Ordinary with old syntax still not works for %s version, look https://github.com/ClickHouse/ClickHouse/issues/43971", os.Getenv("CLICKHOUSE_VERSION"))
706+
env, r := NewTestEnvironment(t)
707+
697708
// === GCS over S3 ===
698709
if compareVersion(version, "24.3") >= 0 && os.Getenv("QA_GCS_OVER_S3_BUCKET") != "" {
699710
//@todo think about named collections to avoid show credentials in logs look to https://github.com/fsouza/fake-gcs-server/issues/1330, https://github.com/fsouza/fake-gcs-server/pull/1164
@@ -702,6 +713,17 @@ func TestEmbedded(t *testing.T) {
702713
env.runMainIntegrationScenario(t, "EMBEDDED_GCS_URL", "config-gcs-embedded-url.yml")
703714
}
704715

716+
env.Cleanup(t, r)
717+
}
718+
719+
func TestEmbeddedS3(t *testing.T) {
720+
version := os.Getenv("CLICKHOUSE_VERSION")
721+
if compareVersion(version, "23.3") < 0 {
722+
t.Skipf("Test skipped, BACKUP/RESTORE not production ready for %s version, look https://github.com/ClickHouse/ClickHouse/issues/39416 for details", version)
723+
}
724+
t.Logf("@TODO RESTORE Ordinary with old syntax still not works for %s version, look https://github.com/ClickHouse/ClickHouse/issues/43971", os.Getenv("CLICKHOUSE_VERSION"))
725+
env, r := NewTestEnvironment(t)
726+
705727
// === S3 ===
706728
// CUSTOM backup creates folder in each disk, need to clear
707729
env.DockerExecNoError(r, "clickhouse", "rm", "-rfv", "/var/lib/clickhouse/disks/backups_s3/backup/")

0 commit comments

Comments
 (0)