diff options
Diffstat (limited to 'internal/service/operations/testhelper_test.go')
| -rw-r--r-- | internal/service/operations/testhelper_test.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/internal/service/operations/testhelper_test.go b/internal/service/operations/testhelper_test.go index 3a5408f6b..5649ed514 100644 --- a/internal/service/operations/testhelper_test.go +++ b/internal/service/operations/testhelper_test.go @@ -11,7 +11,6 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/internal/config" "gitlab.com/gitlab-org/gitaly/internal/git/hooks" "gitlab.com/gitlab-org/gitaly/internal/rubyserver" "gitlab.com/gitlab-org/gitaly/internal/testhelper" @@ -49,17 +48,10 @@ func testMain(m *testing.M) int { if err != nil { log.Fatal(err) } - - defer func(oldDir string) { - config.Config.GitlabShell.Dir = oldDir - }(config.Config.GitlabShell.Dir) - config.Config.GitlabShell.Dir = hookDir - - if err := os.MkdirAll(hooks.Path(), 0755); err != nil { - log.Fatal(err) - } defer os.RemoveAll(hookDir) + hooks.Override = hookDir + testhelper.ConfigureGitalySSH() testhelper.ConfigureRuby() |