diff options
| author | Will Chandler <wchandler@gitlab.com> | 2023-09-05 23:57:29 +0300 |
|---|---|---|
| committer | Will Chandler <wchandler@gitlab.com> | 2023-09-05 23:57:29 +0300 |
| commit | 2d2653afc63b49a40cbee4dc2d5e4c2c700c1abe (patch) | |
| tree | 16106dabfa4b665095d3cd499718764ca688d1f8 /cmd | |
| parent | b9064e00593e573847ca1c6bb28f73b1b9331af0 (diff) | |
| parent | 6a42099a2b2da4cd827daa2ffdb52e23a668a28b (diff) | |
Merge branch 'ps-go-based-tar-writer' into 'master'
archive: Create tarball with archive/tar package
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6080
Merged-by: Will Chandler <wchandler@gitlab.com>
Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: Will Chandler <wchandler@gitlab.com>
Reviewed-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Reviewed-by: Pavlo Strokov <pstrokov@gitlab.com>
Reviewed-by: Pavlo Strokov <pavlo.strokov@refurbed.com>
Co-authored-by: Strokov Pavlo <strokovpavelsergeevich@gmail.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gitaly-hooks/hooks_test.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd/gitaly-hooks/hooks_test.go b/cmd/gitaly-hooks/hooks_test.go index 934f1a3ce..25cd7937f 100644 --- a/cmd/gitaly-hooks/hooks_test.go +++ b/cmd/gitaly-hooks/hooks_test.go @@ -826,9 +826,10 @@ remote: error executing git hook var stderr, stdout bytes.Buffer gittest.ExecOpts(t, cfg, gittest.ExecConfig{ - Env: envForHooks(t, ctx, cfg, repo, glHookValues{GitalyLogDir: logDir}, proxyValues{}), - Stdout: &stdout, - Stderr: &stderr, + Env: envForHooks(t, ctx, cfg, repo, glHookValues{GitalyLogDir: logDir}, proxyValues{}), + Stdout: &stdout, + Stderr: &stderr, + ExpectedExitCode: 128, }, args...) require.Equal(t, "", stdout.String()) |