From 153218165b75c8f8e11b0a64313b1655a383ef5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Leszczy=C5=84ski?= <2000michal@wp.pl> Date: Wed, 28 Aug 2024 15:54:01 +0200 Subject: [PATCH] fix(restoretest): ignore dicts table The dicts table is being dropped for now. See: https://github.com/scylladb/scylla-enterprise/pull/4570 https://github.com/scylladb/scylla-enterprise/pull/4591 https://github.com/scylladb/scylla-enterprise/pull/4592 Fixes #4004 --- pkg/service/restore/service_restore_integration_test.go | 3 --- .../restore/testdata/get_target/continue_false.units.json | 5 ----- .../restore/testdata/get_target/default_values.units.json | 5 ----- 3 files changed, 13 deletions(-) diff --git a/pkg/service/restore/service_restore_integration_test.go b/pkg/service/restore/service_restore_integration_test.go index 435f05d7f..bb95be1b5 100644 --- a/pkg/service/restore/service_restore_integration_test.go +++ b/pkg/service/restore/service_restore_integration_test.go @@ -322,9 +322,6 @@ func TestRestoreGetTargetUnitsViewsIntegration(t *testing.T) { if checkAnyConstraint(t, h.Client, "< 1000") { ignoreUnits = append(ignoreUnits, "system_replicated_keys") } - if checkAnyConstraint(t, h.Client, "< 2024.2") { - ignoreUnits = append(ignoreUnits, "dicts") - } if checkAnyConstraint(t, h.Client, ">= 6.0, < 2000", ">= 2024.2, > 1000") { ignoreUnits = append(ignoreUnits, "system_auth", diff --git a/pkg/service/restore/testdata/get_target/continue_false.units.json b/pkg/service/restore/testdata/get_target/continue_false.units.json index cbf950a42..a932102a8 100644 --- a/pkg/service/restore/testdata/get_target/continue_false.units.json +++ b/pkg/service/restore/testdata/get_target/continue_false.units.json @@ -71,11 +71,6 @@ "tombstone_gc": "timeout", "size": 185891 }, - { - "table": "dicts", - "tombstone_gc": "timeout", - "size": 0 - }, { "table": "service_levels", "tombstone_gc": "timeout", diff --git a/pkg/service/restore/testdata/get_target/default_values.units.json b/pkg/service/restore/testdata/get_target/default_values.units.json index cbf950a42..a932102a8 100644 --- a/pkg/service/restore/testdata/get_target/default_values.units.json +++ b/pkg/service/restore/testdata/get_target/default_values.units.json @@ -71,11 +71,6 @@ "tombstone_gc": "timeout", "size": 185891 }, - { - "table": "dicts", - "tombstone_gc": "timeout", - "size": 0 - }, { "table": "service_levels", "tombstone_gc": "timeout",