Rename Assert to ExpectNoErrors

Author: timoreimann

pkg/sanity/logger.go

@@ -21,7 +21,6 @@ import (
 	"log"
 
 	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 )
 
 type logger struct {
@@ -54,8 +53,8 @@ func (l *logger) Errorf(err error, format string, v ...interface{}) {
 	l.l.Printf(format, v...)
 }
 
-// Assert fails the spec if any error was logged.
-func (l *logger) Assert(offset int) {
+// ExpectNoErrors fails the spec if any error was logged.
+func (l *logger) ExpectNoErrors(offset int) {
 	if l.numFailed > 0 {
 		Fail(fmt.Sprintf("recorded %d failure(s)", l.numFailed), offset+1)
 	}

pkg/sanity/resources.go

@@ -254,7 +254,7 @@ func (cl *Resources) Cleanup() {
 
 func (cl *Resources) deleteVolumes(ctx context.Context, offset int) {
 	logger := newLogger("cleanup volumes:")
-	defer logger.Assert(offset + 1)
+	defer logger.ExpectNoErrors(offset + 1)
 
 	for volumeID, info := range cl.volumes {
 		logger.Infof("deleting %s", volumeID)
@@ -310,7 +310,7 @@ func (cl *Resources) deleteVolumes(ctx context.Context, offset int) {
 
 func (cl *Resources) deleteSnapshots(ctx context.Context, offset int) {
 	logger := newLogger("cleanup snapshots:")
-	defer logger.Assert(offset + 1)
+	defer logger.ExpectNoErrors(offset + 1)
 
 	for id := range cl.snapshots {
 		logger.Infof("deleting %s", id)