Skip to content

Commit c6fea4f

Browse files
committed
Use Fail on failure count for logger assertions
1 parent 9a67df4 commit c6fea4f

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pkg/sanity/logger.go

+7-4
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@ limitations under the License.
1717
package sanity
1818

1919
import (
20+
"fmt"
2021
"log"
2122

2223
. "github.com/onsi/ginkgo"
2324
. "github.com/onsi/gomega"
2425
)
2526

2627
type logger struct {
27-
l *log.Logger
28-
failed bool
28+
l *log.Logger
29+
numFailed int
2930
}
3031

3132
func newLogger(prefix string) *logger {
@@ -49,11 +50,13 @@ func (l *logger) Errorf(err error, format string, v ...interface{}) {
4950
if err == nil {
5051
return
5152
}
52-
l.failed = true
53+
l.numFailed++
5354
l.l.Printf(format, v...)
5455
}
5556

5657
// Assert fails the spec if any error was logged.
5758
func (l *logger) Assert(offset int) {
58-
ExpectWithOffset(offset+1, l.failed).To(BeFalse())
59+
if l.numFailed > 0 {
60+
Fail(fmt.Sprintf("recorded %d failure(s)", l.numFailed), offset+1)
61+
}
5962
}

0 commit comments

Comments
 (0)