Texnico
/
logrus
mirror of https://github.com/sirupsen/logrus.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1390 from ashmckenzie/ashmckenzie/fix-staticcheck-issues

This commit is contained in:
Simon Eskildsen 2023-06-03 16:46:05 -04:00 committed by GitHub
parent d40e25cd45 80d649c2d1
commit 104b8b0048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
entry_test.go
View File

@ -10,6 +10,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
type contextKeyType string
func TestEntryWithError(t *testing.T) { func TestEntryWithError(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
@ -36,7 +38,8 @@ func TestEntryWithError(t *testing.T) {
func TestEntryWithContext(t *testing.T) { func TestEntryWithContext(t *testing.T) {
assert := assert.New(t) assert := assert.New(t)
ctx := context.WithValue(context.Background(), "foo", "bar") var contextKey contextKeyType = "foo"
ctx := context.WithValue(context.Background(), contextKey, "bar")
assert.Equal(ctx, WithContext(ctx).Context) assert.Equal(ctx, WithContext(ctx).Context)
@ -56,11 +59,13 @@ func TestEntryWithContextCopiesData(t *testing.T) {
parentEntry := NewEntry(logger).WithField("parentKey", "parentValue") parentEntry := NewEntry(logger).WithField("parentKey", "parentValue")
// Create two children Entry objects from the parent in different contexts // Create two children Entry objects from the parent in different contexts
ctx1 := context.WithValue(context.Background(), "foo", "bar") var contextKey1 contextKeyType = "foo"
ctx1 := context.WithValue(context.Background(), contextKey1, "bar")
childEntry1 := parentEntry.WithContext(ctx1) childEntry1 := parentEntry.WithContext(ctx1)
assert.Equal(ctx1, childEntry1.Context) assert.Equal(ctx1, childEntry1.Context)
ctx2 := context.WithValue(context.Background(), "bar", "baz") var contextKey2 contextKeyType = "bar"
ctx2 := context.WithValue(context.Background(), contextKey2, "baz")
childEntry2 := parentEntry.WithContext(ctx2) childEntry2 := parentEntry.WithContext(ctx2)
assert.Equal(ctx2, childEntry2.Context) assert.Equal(ctx2, childEntry2.Context)
assert.NotEqual(ctx1, ctx2) assert.NotEqual(ctx1, ctx2)

3
logrus_test.go
View File

@ -544,8 +544,7 @@ func TestParseLevel(t *testing.T) {
} }
func TestLevelString(t *testing.T) { func TestLevelString(t *testing.T) {
var loggerlevel Level var loggerlevel Level = 32000
loggerlevel = 32000
_ = loggerlevel.String() _ = loggerlevel.String()
} }