lib: always show timeout duration in error message

lib/timeout_error.go

@@ -27,11 +27,7 @@ func NewTimeoutError(place string, d time.Duration) TimeoutError {
 
 // String returns timeout error in human readable format.
 func (t TimeoutError) String() string {
-	s := t.place + " execution timed out"
-	if t.d.Seconds() > 0 {
-		s += fmt.Sprintf(" after %.f seconds", t.d.Seconds())
-	}
-	return s
+	return fmt.Sprintf("%s execution timed out after %.f seconds", t.place, t.d.Seconds())
 }
 
 // Error implements error interface.

lib/timeout_error_test.go

@@ -1,10 +1,29 @@
 package lib
 
 import (
+	"strings"
 	"testing"
 	"time"
 )
 
+func TestTimeoutError(t *testing.T) {
+	tests := []struct {
+		stage, expectedStrContain string
+		d                         time.Duration
+	}{
+		{"setup", "1 seconds", time.Second},
+		{"teardown", "2 seconds", time.Second * 2},
+		{"", "0 seconds", time.Duration(0)},
+	}
+
+	for _, tc := range tests {
+		te := NewTimeoutError(tc.stage, tc.d)
+		if !strings.Contains(te.String(), tc.expectedStrContain) {
+			t.Errorf("Expected error contains %s, but got: %s", tc.expectedStrContain, te.String())
+		}
+	}
+}
+
 func TestTimeoutErrorHint(t *testing.T) {
 	tests := []struct {
 		stage string