Skip to content

Prevent re-interpreting errors if they have placeholder patterns #785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Prevent re-interpreting errors if they have placeholder patterns #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ct/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ type TestLike interface {
Skipf(msg string, args ...interface{})
Error(args ...interface{})
Errorf(msg string, args ...interface{})
Fatal(msg string)
Fatalf(msg string, args ...interface{})
Failed() bool
Name() string
Expand All @@ -29,6 +30,13 @@ func Errorf(t TestLike, format string, args ...any) {
t.Errorf(format, args...)
}

// Fatal is a wrapper around t.Fatal which prints the failing error message in red.
func Fatal(t TestLike, format string) {
t.Helper()
format = ansiRedForeground + format + ansiResetForeground
t.Fatal(format)
}

// Fatalf is a wrapper around t.Fatalf which prints the failing error message in red.
func Fatalf(t TestLike, format string, args ...any) {
t.Helper()
Expand Down
30 changes: 15 additions & 15 deletions must/must.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func ParseJSON(t ct.TestLike, b io.ReadCloser) gjson.Result {
t.Helper()
res, err := should.ParseJSON(b)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
return res
}
Expand All @@ -45,7 +45,7 @@ func MatchRequest(t ct.TestLike, req *http.Request, m match.HTTPRequest) []byte
t.Helper()
res, err := should.MatchRequest(req, m)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
return res
}
Expand All @@ -55,7 +55,7 @@ func MatchRequest(t ct.TestLike, req *http.Request, m match.HTTPRequest) []byte
func MatchSuccess(t ct.TestLike, res *http.Response) {
t.Helper()
if err := should.MatchSuccess(res); err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
}

Expand All @@ -64,7 +64,7 @@ func MatchSuccess(t ct.TestLike, res *http.Response) {
func MatchFailure(t ct.TestLike, res *http.Response) {
t.Helper()
if err := should.MatchFailure(res); err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
}

Expand All @@ -74,7 +74,7 @@ func MatchResponse(t ct.TestLike, res *http.Response, m match.HTTPResponse) []by
t.Helper()
body, err := should.MatchResponse(res, m)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
return body
}
Expand All @@ -84,7 +84,7 @@ func MatchFederationRequest(t ct.TestLike, fedReq *fclient.FederationRequest, ma
t.Helper()
err := should.MatchFederationRequest(fedReq)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
}

Expand All @@ -94,7 +94,7 @@ func MatchGJSON(t ct.TestLike, jsonResult gjson.Result, matchers ...match.JSON)
t.Helper()
err := should.MatchGJSON(jsonResult, matchers...)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
}

Expand All @@ -104,7 +104,7 @@ func MatchJSONBytes(t ct.TestLike, rawJson []byte, matchers ...match.JSON) {
t.Helper()
err := should.MatchJSONBytes(rawJson, matchers...)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
}

Expand Down Expand Up @@ -141,7 +141,7 @@ func GetJSONFieldStr(t ct.TestLike, body gjson.Result, wantKey string) string {
t.Helper()
str, err := should.GetJSONFieldStr(body, wantKey)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
return str
}
Expand All @@ -152,7 +152,7 @@ func HaveInOrder[V comparable](t ct.TestLike, gots []V, wants []V) {
t.Helper()
err := should.HaveInOrder(gots, wants)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
}

Expand All @@ -163,7 +163,7 @@ func ContainSubset[V comparable](t ct.TestLike, larger []V, smaller []V) {
t.Helper()
err := should.ContainSubset(larger, smaller)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
}

Expand All @@ -174,7 +174,7 @@ func NotContainSubset[V comparable](t ct.TestLike, larger []V, smaller []V) {
t.Helper()
err := should.NotContainSubset(larger, smaller)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
}

Expand All @@ -188,7 +188,7 @@ func CheckOffAll(t ct.TestLike, items []interface{}, wantItems []interface{}) {
t.Helper()
err := should.CheckOffAll(items, wantItems)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
}

Expand All @@ -202,7 +202,7 @@ func CheckOffAllAllowUnwanted(t ct.TestLike, items []interface{}, wantItems []in
t.Helper()
result, err := should.CheckOffAllAllowUnwanted(items, wantItems)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
return result
}
Expand All @@ -215,7 +215,7 @@ func CheckOff(t ct.TestLike, items []interface{}, wantItem interface{}) []interf
t.Helper()
result, err := should.CheckOff(items, wantItem)
if err != nil {
ct.Fatalf(t, err.Error())
ct.Fatal(t, err.Error())
}
return result
}
Expand Down
Loading