Skip to content

Commit ce09f85

Browse files
chore(treewide): stabilize CI
TestServiceStorageIntegration was inherently flaky, as it didn't ensure listed cluster order on validation. Sorting cluster fixes that. TestRestoreGetTargetUnitsViewsIntegration started failing because the default tombstone gc mode of some system tables has changed from timeout to repair. It's annoying to keep track of it across different scylla versions, and we don't really care for the specific value, so this check was replaced with non-empty tombstone gc mode check. TestServiceRepairIntegration/repair_ignore_hosts behaved flaky due to a small timeout which is increased.
1 parent 0faba73 commit ce09f85

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

pkg/service/cluster/service_integration_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,9 @@ func TestServiceStorageIntegration(t *testing.T) {
315315
UUIDComparer(),
316316
cmpopts.IgnoreFields(cluster.Cluster{}, "Host"),
317317
cmpopts.IgnoreFields(cluster.Cluster{}, "KnownHosts"),
318+
cmpopts.SortSlices(func(a, b *cluster.Cluster) bool {
319+
return a.ID.String() < b.ID.String()
320+
}),
318321
}
319322

320323
t.Run("list empty", func(t *testing.T) {

pkg/service/repair/service_repair_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ func TestServiceRepairIntegration(t *testing.T) {
10881088
Print("When: repair is done")
10891089
rd := scyllaclient.NewRingDescriber(ctx, h.Client)
10901090
if rd.IsTabletKeyspace("test_repair") {
1091-
h.assertDonePartialTabletRepair(shortWait, startNodeFunc)
1091+
h.assertDonePartialTabletRepair(longWait, startNodeFunc)
10921092
} else {
10931093
h.assertDone(longWait)
10941094
}

pkg/service/restore/service_restore_integration_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,11 +483,19 @@ func TestRestoreGetTargetUnitsViewsIntegration(t *testing.T) {
483483
cmpopts.SortSlices(func(a, b Table) bool { return a.Table < b.Table }),
484484
cmpopts.IgnoreFields(Unit{}, "Size"),
485485
cmpopts.IgnoreFields(Table{}, "Size"),
486+
cmpopts.IgnoreFields(Table{}, "TombstoneGC"),
486487
cmpopts.IgnoreSliceElements(func(v Unit) bool { return slices.Contains(ignoreUnits, v.Keyspace) }),
487488
cmpopts.IgnoreSliceElements(func(v Table) bool { return slices.Contains(ignoreUnits, v.Table) }),
488489
); diff != "" {
489490
t.Fatal(tc.units, diff)
490491
}
492+
for _, u := range units {
493+
for _, tab := range u.Tables {
494+
if tab.TombstoneGC == "" {
495+
t.Fatalf("Expected tombstone gc mode of %s.%s to be set", u.Keyspace, tab.Table)
496+
}
497+
}
498+
}
491499

492500
if goldenViews == nil {
493501
goldenViews = make([]View, 0)

0 commit comments

Comments
 (0)