diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 02:18:09 +0300 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /workhorse/main_test.go | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'workhorse/main_test.go')
-rw-r--r-- | workhorse/main_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/workhorse/main_test.go b/workhorse/main_test.go index 195b1166c75..5ebc26c7ac7 100644 --- a/workhorse/main_test.go +++ b/workhorse/main_test.go @@ -35,7 +35,7 @@ import ( ) const scratchDir = "testdata/scratch" -const testRepoRoot = "testdata/data" +const testRepoRoot = "testdata/repo" const testDocumentRoot = "testdata/public" const testAltDocumentRoot = "testdata/alt-public" @@ -799,7 +799,7 @@ func startWorkhorseServer(authBackend string) *httptest.Server { func startWorkhorseServerWithConfig(cfg *config.Config) *httptest.Server { testhelper.ConfigureSecret() - u := upstream.NewUpstream(*cfg, logrus.StandardLogger()) + u := upstream.NewUpstream(*cfg, logrus.StandardLogger(), nil) return httptest.NewServer(u) } |