summaryrefslogtreecommitdiff
path: root/internal/command/uploadpack/gitalycall_test.go
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2020-05-08 15:40:18 -0700
committerStan Hu <stanhu@gmail.com>2020-05-08 15:40:18 -0700
commitc0cf314c5722a4f7ec0a1f355d23fa2511344989 (patch)
tree96898bec50690d0d34eb9ead815b8ef4a89a40ce /internal/command/uploadpack/gitalycall_test.go
parent1adadc2e299529e805aae3dac7c2579b88c8dae7 (diff)
downloadgitlab-shell-c0cf314c5722a4f7ec0a1f355d23fa2511344989.tar.gz
Fix race conditions in testssh-add-http-status-code
Calling logrus hook.LastEntry() can lead to race conditions. Use AllEntries instead: https://github.com/sirupsen/logrus/blob/60c74ad9be0d874af0ab0daef6ab07c5c5911f0d/hooks/test/test.go#L77 Closes https://gitlab.com/gitlab-org/gitlab-shell/-/issues/450
Diffstat (limited to 'internal/command/uploadpack/gitalycall_test.go')
-rw-r--r--internal/command/uploadpack/gitalycall_test.go10
1 files changed, 4 insertions, 6 deletions
diff --git a/internal/command/uploadpack/gitalycall_test.go b/internal/command/uploadpack/gitalycall_test.go
index 4421d41..cf3e621 100644
--- a/internal/command/uploadpack/gitalycall_test.go
+++ b/internal/command/uploadpack/gitalycall_test.go
@@ -2,11 +2,8 @@ package uploadpack
import (
"bytes"
- "strings"
"testing"
- "github.com/sirupsen/logrus"
-
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -44,9 +41,10 @@ func TestUploadPack(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "UploadPack: "+repo, output.String())
- require.Equal(t, logrus.InfoLevel, hook.LastEntry().Level)
- require.True(t, strings.Contains(hook.LastEntry().Message, "executing git command"))
- require.True(t, strings.Contains(hook.LastEntry().Message, "command=git-upload-pack"))
+ entries := hook.AllEntries()
+ assert.Equal(t, 2, len(entries))
+ require.Contains(t, entries[1].Message, "executing git command")
+ require.Contains(t, entries[1].Message, "command=git-upload-pack")
for k, v := range map[string]string{
"gitaly-feature-cache_invalidator": "true",