Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2021-03-01 12:48:53 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2021-03-01 12:48:53 +0300
commitbe99c5da09c2847ebd4b32584aba24448a394e8b (patch)
tree0cfd2370b4ee4fb9930b93bb557ff4e8a89857f8 /internal/tempdir
parent141c3b4899804abd9d2bab26a5fe55497e54e1e8 (diff)
testhelper: Move repository helpers into `gittest`
It's currently not possible to use our git DSL in the testhelper package because of an import cycle between the testhelper and git package. To fix this import cycle, we thus move test-related git helpers into the gittest package. This commit moves the repository helpers. As we're already touching all sites which use these helpers anyway, it also aligns functions to have more consistent naming.
Diffstat (limited to 'internal/tempdir')
-rw-r--r--internal/tempdir/tempdir_test.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/tempdir/tempdir_test.go b/internal/tempdir/tempdir_test.go
index 29f952ef2..b792ae2c1 100644
--- a/internal/tempdir/tempdir_test.go
+++ b/internal/tempdir/tempdir_test.go
@@ -10,6 +10,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/require"
+ "gitlab.com/gitlab-org/gitaly/internal/git/gittest"
"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
"gitlab.com/gitlab-org/gitaly/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
@@ -19,7 +20,7 @@ func TestNewAsRepositorySuccess(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
- repo, _, cleanup := testhelper.NewTestRepo(t)
+ repo, _, cleanup := gittest.CloneRepo(t)
defer cleanup()
locator := config.NewLocator(config.Config)