WIP

internal/testutils/expectations.go

@@ -11,32 +11,44 @@ func NewAwaiter() Awaiter { return make(Awaiter, 10) }
 
 func (a Awaiter) ItHappened() { a <- struct{}{} }
 
-func (a Awaiter) AwaitOrFail(t testing.TB, durationParams ...time.Duration) {
+func (a Awaiter) AwaitOrFail(t testing.TB, params ...interface{}) {
 	t.Helper()
 
 	duration := 10 * time.Second
-	if len(durationParams) > 0 {
-		duration = durationParams[0]
+	msg := ""
+	for _, p := range params {
+		switch p := p.(type) {
+		case time.Duration:
+			duration = p
+		case string:
+			msg = p
+		}
 	}
 
 	select {
 	case <-a:
 	case <-time.After(duration):
-		t.Fatal("Timed out waiting for Awaiter to get ItHappened")
+		t.Fatalf("Timed out waiting for Awaiter to get ItHappened: %v", msg)
 	}
 }
 
-func (a Awaiter) NeverHappenedOrFail(t testing.TB, durationParams ...time.Duration) {
+func (a Awaiter) NeverHappenedOrFail(t testing.TB, params ...interface{}) {
 	t.Helper()
 
 	duration := 10 * time.Second
-	if len(durationParams) > 0 {
-		duration = durationParams[0]
+	msg := ""
+	for _, p := range params {
+		switch p := p.(type) {
+		case time.Duration:
+			duration = p
+		case string:
+			msg = p
+		}
 	}
 
 	select {
 	case <-a:
-		t.Fatal("should not happen")
+		t.Fatalf("should not happen: %v", msg)
 	case <-time.After(duration):
 	}
 }