github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Added new helper methods FailfWithOffset and ExpectNoErrorWithOffset.

Browse Source
This commit is contained in:
Andrzej Wasylkowski 2017-06-02 12:01:08 +02:00
parent c13d8917c2
commit 30b3472f89
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/framework/util.go
View File

@ -286,9 +286,15 @@ func Logf(format string, args ...interface{}) {
} }
func Failf(format string, args ...interface{}) { func Failf(format string, args ...interface{}) {
FailfWithOffset(1, format, args...)
}
// FailfWithOffset calls "Fail" and logs the error at "offset" levels above its caller
// (for example, for call chain f -> g -> FailfWithOffset(1, ...) error would be logged for "f").
func FailfWithOffset(offset int, format string, args ...interface{}) {
msg := fmt.Sprintf(format, args...) msg := fmt.Sprintf(format, args...)
log("INFO", msg) log("INFO", msg)
Fail(nowStamp()+": "+msg, 1) Fail(nowStamp()+": "+msg, 1 + offset)
} }
func Skipf(format string, args ...interface{}) { func Skipf(format string, args ...interface{}) {
@ -1917,10 +1923,16 @@ func randomSuffix() string {
} }
func ExpectNoError(err error, explain ...interface{}) { func ExpectNoError(err error, explain ...interface{}) {
ExpectNoErrorWithOffset(1, err, explain...)
}
// ExpectNoErrorWithOffset checks if "err" is set, and if so, fails assertion while logging the error at "offset" levels above its caller
// (for example, for call chain f -> g -> ExpectNoErrorWithOffset(1, ...) error would be logged for "f").
func ExpectNoErrorWithOffset(offset int, err error, explain ...interface{}) {
if err != nil { if err != nil {
Logf("Unexpected error occurred: %v", err) Logf("Unexpected error occurred: %v", err)
} }
ExpectWithOffset(1, err).NotTo(HaveOccurred(), explain...) ExpectWithOffset(1 + offset, err).NotTo(HaveOccurred(), explain...)
} }
func ExpectNoErrorWithRetries(fn func() error, maxRetries int, explain ...interface{}) { func ExpectNoErrorWithRetries(fn func() error, maxRetries int, explain ...interface{}) {