summaryrefslogtreecommitdiff
path: root/internal/command
diff options
context:
space:
mode:
Diffstat (limited to 'internal/command')
-rw-r--r--internal/command/receivepack/gitalycall_test.go10
-rw-r--r--internal/command/uploadarchive/gitalycall_test.go9
-rw-r--r--internal/command/uploadpack/gitalycall_test.go10
3 files changed, 15 insertions, 14 deletions
diff --git a/internal/command/receivepack/gitalycall_test.go b/internal/command/receivepack/gitalycall_test.go
index dd75176..fd062b2 100644
--- a/internal/command/receivepack/gitalycall_test.go
+++ b/internal/command/receivepack/gitalycall_test.go
@@ -2,7 +2,6 @@ package receivepack
import (
"bytes"
- "strings"
"testing"
"github.com/sirupsen/logrus"
@@ -43,7 +42,10 @@ func TestReceivePack(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "ReceivePack: "+userId+" "+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-receive-pack"))
+
+ entries := hook.AllEntries()
+ require.Equal(t, 2, len(entries))
+ require.Equal(t, logrus.InfoLevel, entries[1].Level)
+ require.Contains(t, entries[1].Message, "executing git command")
+ require.Contains(t, entries[1].Message, "command=git-receive-pack")
}
diff --git a/internal/command/uploadarchive/gitalycall_test.go b/internal/command/uploadarchive/gitalycall_test.go
index 95274ee..8b60e11 100644
--- a/internal/command/uploadarchive/gitalycall_test.go
+++ b/internal/command/uploadarchive/gitalycall_test.go
@@ -2,7 +2,6 @@ package uploadarchive
import (
"bytes"
- "strings"
"testing"
"github.com/sirupsen/logrus"
@@ -43,7 +42,9 @@ func TestUploadPack(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "UploadArchive: "+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-archive"))
+ entries := hook.AllEntries()
+ require.Equal(t, 2, len(entries))
+ require.Equal(t, logrus.InfoLevel, entries[1].Level)
+ require.Contains(t, entries[1].Message, "executing git command")
+ require.Contains(t, entries[1].Message, "command=git-upload-archive")
}
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",