diff options
| author | Justin Tobler <jtobler@gitlab.com> | 2023-12-06 23:50:58 +0300 |
|---|---|---|
| committer | Justin Tobler <jtobler@gitlab.com> | 2023-12-06 23:50:58 +0300 |
| commit | 3c1c07f02eab348c198820d880be3db2b1565173 (patch) | |
| tree | 0d8fc8b8a0791add93f9ec2b634a7547350533c9 | |
| parent | bd2af5b95aa18bf368379f8a51944b09fa1892a9 (diff) | |
| parent | 1b3751461d3ac3b8c96730576bc1f3d4f3f4758c (diff) | |
Merge branch 'jt/quarantine-flaky-test' into 'master'
smarthttp: Quarantine all `TestServer_PostUploadPackWithBundleURI` cases
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6572
Merged-by: Justin Tobler <jtobler@gitlab.com>
Approved-by: Eric Ju <eju@gitlab.com>
| -rw-r--r-- | internal/gitaly/service/smarthttp/upload_pack_test.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/internal/gitaly/service/smarthttp/upload_pack_test.go b/internal/gitaly/service/smarthttp/upload_pack_test.go index afb7f66f8..47178ece6 100644 --- a/internal/gitaly/service/smarthttp/upload_pack_test.go +++ b/internal/gitaly/service/smarthttp/upload_pack_test.go @@ -425,17 +425,14 @@ func (s *mockBackupSink) Close() error { func TestServer_PostUploadPackWithBundleURI(t *testing.T) { t.Parallel() + testhelper.SkipQuarantinedTest(t, "https://gitlab.com/gitlab-org/gitaly/-/issues/5725") + testhelper.NewFeatureSets( featureflag.UploadPackBoundaryBitmapTraversal, ).Run(t, testServerPostUploadPackWithBundleURI) } func testServerPostUploadPackWithBundleURI(t *testing.T, ctx context.Context) { - testhelper.SkipQuarantinedTest(t, - "https://gitlab.com/gitlab-org/gitaly/-/issues/5725", - "TestServer_PostUploadPackWithBundleURI/upload_pack_boundary_bitmap_traversal=true", - ) - cfg := testcfg.Build(t) ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.BundleURI, true) |