diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /workhorse/internal/filestore/save_file_opts_test.go | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'workhorse/internal/filestore/save_file_opts_test.go')
-rw-r--r-- | workhorse/internal/filestore/save_file_opts_test.go | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/workhorse/internal/filestore/save_file_opts_test.go b/workhorse/internal/filestore/save_file_opts_test.go index facfb1cdc85..aa7018525ab 100644 --- a/workhorse/internal/filestore/save_file_opts_test.go +++ b/workhorse/internal/filestore/save_file_opts_test.go @@ -57,13 +57,18 @@ func TestSaveFileOptsLocalAndRemote(t *testing.T) { func TestGetOpts(t *testing.T) { tests := []struct { - name string - multipart *api.MultipartUploadParams - customPutHeaders bool - putHeaders map[string]string + name string + multipart *api.MultipartUploadParams + customPutHeaders bool + putHeaders map[string]string + FeatureFlagExtractBase bool }{ { name: "Single upload", + }, + { + name: "Single upload w/ FeatureFlagExtractBase enabled", + FeatureFlagExtractBase: true, }, { name: "Multipart upload", multipart: &api.MultipartUploadParams{ @@ -93,6 +98,7 @@ func TestGetOpts(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { apiResponse := &api.Response{ + FeatureFlagExtractBase: test.FeatureFlagExtractBase, RemoteObject: api.RemoteObject{ Timeout: 10, ID: "id", @@ -108,6 +114,7 @@ func TestGetOpts(t *testing.T) { opts, err := filestore.GetOpts(apiResponse) require.NoError(t, err) + require.Equal(t, apiResponse.FeatureFlagExtractBase, opts.FeatureFlagExtractBase) require.Equal(t, apiResponse.TempPath, opts.LocalTempPath) require.WithinDuration(t, deadline, opts.Deadline, time.Second) require.Equal(t, apiResponse.RemoteObject.ID, opts.RemoteID) |