diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-09-16 11:02:01 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-09-16 11:02:01 +0300 |
| commit | ab2f2386ab69575cd0a58f7279be707a17d7a6c8 (patch) | |
| tree | 64a2a458b25a919772d2d74e45098bdb97e32826 /internal/testhelper | |
| parent | 457bb8e482dbffc19744ae96fb8974087e0d2e1c (diff) | |
| parent | 3cef6ba80866e1c5367d86d8f29fb1e87eb96a08 (diff) | |
Merge branch 'sh-export-gl-project-git-archive' into 'master'
Export GL_REPOSITORY and GL_PROJECT_PATH in `git archive` call
See merge request gitlab-org/gitaly!2557
Diffstat (limited to 'internal/testhelper')
| -rw-r--r-- | internal/testhelper/testhelper.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index 5c8be0bcb..134367ead 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -56,6 +56,7 @@ const ( testGitEnv = "testdata/git-env" GlRepository = "project-1" GlID = "user-123" + GlProjectPath = "gitlab-org/gitlab-test" ) var configureOnce sync.Once @@ -500,9 +501,10 @@ func Context(opts ...ContextOpt) (context.Context, func()) { func CreateRepo(t testing.TB, storagePath, relativePath string) *gitalypb.Repository { require.NoError(t, os.MkdirAll(filepath.Dir(storagePath), 0755), "making repo parent dir") return &gitalypb.Repository{ - StorageName: "default", - RelativePath: relativePath, - GlRepository: GlRepository, + StorageName: "default", + RelativePath: relativePath, + GlRepository: GlRepository, + GlProjectPath: GlProjectPath, } } |