Skip to content

Commit 6a4b72a

Browse files
committed
fix flaky make test
1 parent c8a42af commit 6a4b72a

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

pkg/backup/download_test.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,8 @@ func TestReBalanceTablesMetadataIfDiskNotExists_CheckErrors(t *testing.T) {
211211
invalidRemoteBackup.DataFormat = DirectoryFormat
212212
invalidTable := metadata.TableMetadata{
213213
Parts: map[string][]metadata.Part{
214-
"default": {{Name: "part_1_1_0"}, {Name: "part_2_2_0"}},
215-
"hdd2": {{Name: "part_3_3_0"}, {Name: "part_4_4_0"}},
216-
"s3": {{Name: "part_5_5_0"}, {Name: "part_6_6_0"}},
217-
"s3_disk2": {{Name: "part_7_7_0"}, {Name: "part_8_8_0"}},
214+
"default": {{Name: "part_1_1_0"}, {Name: "part_2_2_0"}},
215+
"hdd2": {{Name: "part_3_3_0"}, {Name: "part_4_4_0"}},
218216
},
219217
RebalancedFiles: nil,
220218
Database: "default",
@@ -227,7 +225,7 @@ func TestReBalanceTablesMetadataIfDiskNotExists_CheckErrors(t *testing.T) {
227225
LocalFile: "/dev/null",
228226
}
229227
tableMetadataAfterDownload := []metadata.TableMetadata{invalidTable}
230-
// not exists diskType
228+
// hdd2 not exists diskType
231229
delete(invalidRemoteBackup.DiskTypes, "hdd2")
232230
err := b.reBalanceTablesMetadataIfDiskNotExists(tableMetadataAfterDownload, baseDisks, invalidRemoteBackup, log)
233231
assert.Error(t, err)
@@ -244,6 +242,13 @@ func TestReBalanceTablesMetadataIfDiskNotExists_CheckErrors(t *testing.T) {
244242

245243
// invalid storage_policy
246244
invalidRemoteBackup.DiskTypes["hdd2"] = "local"
245+
invalidTable.Parts = map[string][]metadata.Part{
246+
"default": {{Name: "part_1_1_0"}, {Name: "part_2_2_0"}},
247+
"hdd2": {{Name: "part_3_3_0"}, {Name: "part_4_4_0"}},
248+
"s3": {{Name: "part_5_5_0"}, {Name: "part_6_6_0"}},
249+
"s3_disk2": {{Name: "part_7_7_0"}, {Name: "part_8_8_0"}},
250+
}
251+
247252
invalidTable.Table = "test3"
248253
invalidTable.Query = "CREATE TABLE default.test3(id UInt64) ENGINE=MergeTree() ORDER BY id SETTINGS storage_policy='invalid'"
249254
tableMetadataAfterDownload = []metadata.TableMetadata{invalidTable}

0 commit comments

Comments
 (0)