fix env.Cleanup method after split TestEmbedded to TestEmbeddedXXX

Slach · Slach · commit b86a6f02ca7a · 2025-05-22T15:06:28.000+05:00
Signed-off-by: Slach &lt;bloodjazman@gmail.com&gt;
diff --git a/test/integration/integration_test.go b/test/integration/integration_test.go
@@ -505,11 +505,11 @@ func NewTestEnvironment(t *testing.T) (*TestEnvironment, *require.Assertions) {
 func (env *TestEnvironment) Cleanup(t *testing.T, r *require.Assertions) {
 	env.ch.Close()
 
-	if t.Name() == "TestS3" || t.Name() == "TestEmbedded" {
+	if t.Name() == "TestS3" || t.Name() == "TestEmbeddedS3" {
 		env.DockerExecNoError(r, "minio", "rm", "-rf", "/bitnami/minio/data/clickhouse/disk_s3")
 	}
 
-	if t.Name() == "TestRBAC" || t.Name() == "TestConfigs" || t.Name() == "TestEmbedded" {
+	if t.Name() == "TestRBAC" || t.Name() == "TestConfigs" || strings.HasPrefix(t.Name(), "TestEmbedded") {
 		env.DockerExecNoError(r, "minio", "rm", "-rf", "/bitnami/minio/data/clickhouse/backups_s3")
 	}
 	if t.Name() == "TestCustomRsync" {

Original file line number	Diff line number	Diff line change
`@@ -505,11 +505,11 @@ func NewTestEnvironment(t testing.T) (TestEnvironment, *require.Assertions) {`
`505`	`505`	`func (env TestEnvironment) Cleanup(t testing.T, r *require.Assertions) {`
`506`	`506`	`env.ch.Close()`
`507`	`507`
`508`		`- if t.Name() == "TestS3" \|\| t.Name() == "TestEmbedded" {`
	`508`	`+ if t.Name() == "TestS3" \|\| t.Name() == "TestEmbeddedS3" {`
`509`	`509`	`env.DockerExecNoError(r, "minio", "rm", "-rf", "/bitnami/minio/data/clickhouse/disk_s3")`
`510`	`510`	`}`
`511`	`511`
`512`		`- if t.Name() == "TestRBAC" \|\| t.Name() == "TestConfigs" \|\| t.Name() == "TestEmbedded" {`
	`512`	`+ if t.Name() == "TestRBAC" \|\| t.Name() == "TestConfigs" \|\| strings.HasPrefix(t.Name(), "TestEmbedded") {`
`513`	`513`	`env.DockerExecNoError(r, "minio", "rm", "-rf", "/bitnami/minio/data/clickhouse/backups_s3")`
`514`	`514`	`}`
`515`	`515`	`if t.Name() == "TestCustomRsync" {`