fixed inconsistencies after cherry picks

gojuno · Jan 29, 2019 · 8957e77 · 8957e77
1 parent 31fe6e7
commit 8957e77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/mock_controller_test.go b/mock_controller_test.go
@@ -73,7 +73,7 @@ type unsafeMocker struct {
 }
 
 func (um *unsafeMocker) MinimockWait(time.Duration) {
-	um.tester.FailNow()
+	um.tester.Fatalf("format")
 }
 
 type unsafeTester struct {
@@ -82,6 +82,6 @@ type unsafeTester struct {
 	finished bool
 }
 
-func (u *unsafeTester) FailNow() {
+func (u *unsafeTester) Fatalf(string, ...interface{}) {
 	u.finished = true
 }
diff --git a/safe_tester.go b/safe_tester.go
@@ -42,11 +42,3 @@ func (st *safeTester) Fatalf(format string, args ...interface{}) {
 
 	st.Tester.Fatalf(format, args...)
 }
-
-// FailNow implements Tester
-func (st *safeTester) FailNow() {
-	st.m.Lock()
-	defer st.m.Unlock()
-
-	st.Tester.FailNow()
-}