diff --git a/decorators_test.go b/decorators_test.go index 5614556..154f372 100644 --- a/decorators_test.go +++ b/decorators_test.go @@ -5,6 +5,7 @@ "fmt" "io" "io/ioutil" + "regexp" "strings" "testing" "time" @@ -282,9 +283,16 @@ p.Stop() - want := "0s[" - barOut := buf.String() - if !strings.Contains(barOut, want) { + want := `0s?\[` + barOut := buf.String() + + matched, err := regexp.MatchString(want, barOut) + if err != nil { + t.Logf("Regex %q err: %+v\n", want, err) + t.FailNow() + } + + if !matched { t.Errorf("%q not found in bar: %s\n", want, barOut) } } @@ -303,9 +311,16 @@ p.Stop() - want := "0s [" - barOut := buf.String() - if !strings.Contains(barOut, want) { + want := `0s? \[` + barOut := buf.String() + + matched, err := regexp.MatchString(want, barOut) + if err != nil { + t.Logf("Regex %q err: %+v\n", want, err) + t.FailNow() + } + + if !matched { t.Errorf("%q not found in bar: %s\n", want, barOut) } } @@ -324,9 +339,16 @@ p.Stop() - want := "]0s" - barOut := buf.String() - if !strings.Contains(barOut, want) { + want := `\]0s?` + barOut := buf.String() + + matched, err := regexp.MatchString(want, barOut) + if err != nil { + t.Logf("Regex %q err: %+v\n", want, err) + t.FailNow() + } + + if !matched { t.Errorf("%q not found in bar: %s\n", want, barOut) } } @@ -345,9 +367,16 @@ p.Stop() - want := "]0s " - barOut := buf.String() - if !strings.Contains(barOut, want) { - t.Errorf("%q not found in bar: %s\n", want, barOut) - } -} + want := `\]0s? ` + barOut := buf.String() + + matched, err := regexp.MatchString(want, barOut) + if err != nil { + t.Logf("Regex %q err: %+v\n", want, err) + t.FailNow() + } + + if !matched { + t.Errorf("%q not found in bar: %s\n", want, barOut) + } +}