diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
| commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
| tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /workhorse/sendfile_test.go | |
| parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) | |
| download | gitlab-ce-aee0a117a889461ce8ced6fcf73207fe017f1d99.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'workhorse/sendfile_test.go')
| -rw-r--r-- | workhorse/sendfile_test.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/workhorse/sendfile_test.go b/workhorse/sendfile_test.go index 2408f4fde38..0a01e410d39 100644 --- a/workhorse/sendfile_test.go +++ b/workhorse/sendfile_test.go @@ -5,13 +5,15 @@ import ( "io/ioutil" "mime" "net/http" - "net/http/httptest" "os" "path" + "regexp" "testing" "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/labkit/log" + + "gitlab.com/gitlab-org/gitlab/workhorse/internal/testhelper" ) func TestDeniedLfsDownload(t *testing.T) { @@ -35,7 +37,7 @@ func allowedXSendfileDownload(t *testing.T, contentFilename string, filePath str prepareDownloadDir(t) // Prepare test server and backend - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + ts := testhelper.TestServerWithHandler(regexp.MustCompile(`.`), http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { log.WithFields(log.Fields{"method": r.Method, "url": r.URL}).Info("UPSTREAM") require.Equal(t, "X-Sendfile", r.Header.Get("X-Sendfile-Type")) @@ -69,7 +71,7 @@ func deniedXSendfileDownload(t *testing.T, contentFilename string, filePath stri prepareDownloadDir(t) // Prepare test server and backend - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + ts := testhelper.TestServerWithHandler(regexp.MustCompile(`.`), http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { log.WithFields(log.Fields{"method": r.Method, "url": r.URL}).Info("UPSTREAM") require.Equal(t, "X-Sendfile", r.Header.Get("X-Sendfile-Type")) |