diff options
| author | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2023-02-17 06:45:20 +0300 |
|---|---|---|
| committer | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2023-02-17 06:45:20 +0300 |
| commit | edf780138958fabce112a7d048d7a7511f0a061a (patch) | |
| tree | 77a1726899511a86f7c801b62ab1c17e2fff0b12 | |
| parent | 3841b8df341e41b3ed7e70306c910792823508bf (diff) | |
| parent | a6638b4a72200c8f26caecdf7e5e536a07135794 (diff) | |
Merge branch 'smh-disable-verifier-in-tests' into 'master'
Disable background verifier in tests
Closes #4773
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5399
Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Approved-by: Justin Tobler <jtobler@gitlab.com>
Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Co-authored-by: Sami Hiltunen <shiltunen@gitlab.com>
| -rw-r--r-- | internal/gitaly/service/repository/replicate_test.go | 4 | ||||
| -rw-r--r-- | internal/testhelper/testserver/gitaly.go | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/internal/gitaly/service/repository/replicate_test.go b/internal/gitaly/service/repository/replicate_test.go index d81979428..8e87ae0cd 100644 --- a/internal/gitaly/service/repository/replicate_test.go +++ b/internal/gitaly/service/repository/replicate_test.go @@ -415,10 +415,6 @@ func TestReplicateRepository_BadRepository(t *testing.T) { }, } { t.Run(tc.desc, func(t *testing.T) { - testhelper.SkipQuarantinedTest(t, - "https://gitlab.com/gitlab-org/gitaly/-/issues/4773", - "TestReplicateRepository_BadRepository/target_invalid") - cfgBuilder := testcfg.NewGitalyCfgBuilder(testcfg.WithStorages("default", "target")) cfg := cfgBuilder.Build(t) diff --git a/internal/testhelper/testserver/gitaly.go b/internal/testhelper/testserver/gitaly.go index 12da30497..9f69e69da 100644 --- a/internal/testhelper/testserver/gitaly.go +++ b/internal/testhelper/testserver/gitaly.go @@ -98,6 +98,14 @@ func runPraefectProxy(tb testing.TB, gitalyCfg config.Cfg, gitalyAddr string) Pr Enabled: true, ElectionStrategy: praefectconfig.ElectionStrategyLocal, }, + BackgroundVerification: praefectconfig.BackgroundVerification{ + // Some tests cases purposefully create bad metadata by deleting a repository off + // the disk. If the background verifier is running, it could find these repositories + // and remove the invalid metadata related to them. This can cause the test assertions + // to fail. As the background verifier runs asynchronously and possibly changes state + // during a test and issues unexpected RPCs, it's disabled generally for all tests. + VerificationInterval: -1, + }, Replication: praefectconfig.DefaultReplicationConfig(), Logging: gitalylog.Config{ Format: "json", |