mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-25 12:57:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes display issue in testutils/assert (#6585)

Browse Source 
* fixes minor display issue in testutils/assert
This commit is contained in:
Victor Farazdagi 2020-07-13 20:20:18 +03:00 committed by GitHub
parent 77d1a6c698
commit d1e754f011
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shared/testutil/assertions.go
View File

@ -20,8 +20,8 @@ type assertionLoggerFn func(string, ...interface{})
func Equal(loggerFn assertionLoggerFn, expected, actual interface{}, msg ...string) {
errMsg := parseMsg("Values are not equal", msg...)
if expected != actual {
_, file, line, _ := runtime.Caller(1)
loggerFn("%s:%d %s, got: %v, want: %v", file, line, errMsg, actual, expected)
_, file, line, _ := runtime.Caller(2)
loggerFn("%s:%d %s, got: %v, want: %v", filepath.Base(file), line, errMsg, actual, expected)
}
}
@ -29,8 +29,8 @@ func Equal(loggerFn assertionLoggerFn, expected, actual interface{}, msg ...stri
func DeepEqual(loggerFn assertionLoggerFn, expected, actual interface{}, msg ...string) {
errMsg := parseMsg("Values are not equal", msg...)
if !reflect.DeepEqual(expected, actual) {
_, file, line, _ := runtime.Caller(1)
loggerFn("%s:%d %s, got: %v, want: %v", file, line, errMsg, actual, expected)
_, file, line, _ := runtime.Caller(2)
loggerFn("%s:%d %s, got: %v, want: %v", filepath.Base(file), line, errMsg, actual, expected)
}
}
@ -38,7 +38,7 @@ func DeepEqual(loggerFn assertionLoggerFn, expected, actual interface{}, msg ...
func NoError(loggerFn assertionLoggerFn, err error, msg ...string) {
errMsg := parseMsg("Unexpected error", msg...)
if err != nil {
_, file, line, _ := runtime.Caller(1)
_, file, line, _ := runtime.Caller(2)
loggerFn("%s:%d %s: %v", filepath.Base(file), line, errMsg, err)
}
}
@ -47,7 +47,7 @@ func NoError(loggerFn assertionLoggerFn, err error, msg ...string) {
func ErrorContains(loggerFn assertionLoggerFn, want string, err error, msg ...string) {
errMsg := parseMsg("Expected error not returned", msg...)
if err == nil || !strings.Contains(err.Error(), want) {
_, file, line, _ := runtime.Caller(1)
_, file, line, _ := runtime.Caller(2)
loggerFn("%s:%d %s, got: %v, want: %s", filepath.Base(file), line, errMsg, err, want)
}
}
@ -56,7 +56,7 @@ func ErrorContains(loggerFn assertionLoggerFn, want string, err error, msg ...st
func NotNil(loggerFn assertionLoggerFn, obj interface{}, msg ...string) {
errMsg := parseMsg("Unexpected nil value", msg...)
if obj == nil {
_, file, line, _ := runtime.Caller(1)
_, file, line, _ := runtime.Caller(2)
loggerFn("%s:%d %s", filepath.Base(file), line, errMsg)
}
}