diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2020-09-21 04:47:01 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2020-09-21 04:47:01 +0000 |
| commit | 1a2bfecd2f0ebb8e31f9833e0522c4643797041b (patch) | |
| tree | d17cf7bff45492a587027851bb6e0bcb493cff58 /internal/command/uploadpack/uploadpack_test.go | |
| parent | f100e7e83943b3bb5db232f5bf79a616fdba88f1 (diff) | |
| parent | a487572a904cc149840488eefdfe121173d8bcb5 (diff) | |
| download | gitlab-shell-1a2bfecd2f0ebb8e31f9833e0522c4643797041b.tar.gz | |
Merge branch 'sh-extract-context-from-env' into 'master'
Make it possible to propagate correlation ID across processes
Closes #474
See merge request gitlab-org/gitlab-shell!413
Diffstat (limited to 'internal/command/uploadpack/uploadpack_test.go')
| -rw-r--r-- | internal/command/uploadpack/uploadpack_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/command/uploadpack/uploadpack_test.go b/internal/command/uploadpack/uploadpack_test.go index 7ea8e5d..20edb57 100644 --- a/internal/command/uploadpack/uploadpack_test.go +++ b/internal/command/uploadpack/uploadpack_test.go @@ -2,6 +2,7 @@ package uploadpack import ( "bytes" + "context" "testing" "github.com/stretchr/testify/require" @@ -26,6 +27,6 @@ func TestForbiddenAccess(t *testing.T) { ReadWriter: &readwriter.ReadWriter{ErrOut: output, Out: output}, } - err := cmd.Execute() + err := cmd.Execute(context.Background()) require.Equal(t, "Disallowed by API call", err.Error()) } |