kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

pkg/jsonmessage: Format all test expected/actual strings with %q

Browse source 
The majority already did so, but a few used %v.

Compared with %v using %q escapes any control characters ensuring they are
visible in the logs (otherwise they can cause scrolling and overwriting etc).

The %q formatter also includes the surrounding "s making the manual use of []
to wrap/delimit the %v output unnecessary.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell 2016-11-11 11:07:04 +00:00
parent 90d10203a4
commit 6582cfb1d4
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/jsonmessage/jsonmessage_test.go
View file

@ -144,7 +144,7 @@ func TestJSONMessageDisplay(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if data.String() != expectedMessages[0] { if data.String() != expectedMessages[0] {
t.Fatalf("Expected [%v], got [%v]", expectedMessages[0], data.String()) t.Fatalf("Expected %q, got %q", expectedMessages[0], data.String())
} }
// With terminal // With terminal
data = bytes.NewBuffer([]byte{}) data = bytes.NewBuffer([]byte{})
@ -152,7 +152,7 @@ func TestJSONMessageDisplay(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if data.String() != expectedMessages[1] { if data.String() != expectedMessages[1] {
t.Fatalf("Expected [%v], got [%v]", expectedMessages[1], data.String()) t.Fatalf("Expected %q, got %q", expectedMessages[1], data.String())
} }
} }
} }
@ -164,13 +164,13 @@ func TestJSONMessageDisplayWithJSONError(t *testing.T) {
err := jsonMessage.Display(data, true) err := jsonMessage.Display(data, true)
if err == nil || err.Error() != "Can't find it" { if err == nil || err.Error() != "Can't find it" {
t.Fatalf("Expected a JSONError 404, got [%v]", err) t.Fatalf("Expected a JSONError 404, got %q", err)
} }
jsonMessage = JSONMessage{Error: &JSONError{401, "Anything"}} jsonMessage = JSONMessage{Error: &JSONError{401, "Anything"}}
err = jsonMessage.Display(data, true) err = jsonMessage.Display(data, true)
if err == nil || err.Error() != "Authentication is required." { if err == nil || err.Error() != "Authentication is required." {
t.Fatalf("Expected an error [Authentication is required.], got [%v]", err) t.Fatalf("Expected an error \"Authentication is required.\", got %q", err)
} }
} }
@ -183,7 +183,7 @@ func TestDisplayJSONMessagesStreamInvalidJSON(t *testing.T) {
inFd, _ = term.GetFdInfo(reader) inFd, _ = term.GetFdInfo(reader)
if err := DisplayJSONMessagesStream(reader, data, inFd, false, nil); err == nil && err.Error()[:17] != "invalid character" { if err := DisplayJSONMessagesStream(reader, data, inFd, false, nil); err == nil && err.Error()[:17] != "invalid character" {
t.Fatalf("Should have thrown an error (invalid character in ..), got [%v]", err) t.Fatalf("Should have thrown an error (invalid character in ..), got %q", err)
} }
} }
@ -228,7 +228,7 @@ func TestDisplayJSONMessagesStream(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if data.String() != expectedMessages[0] { if data.String() != expectedMessages[0] {
t.Fatalf("Expected an [%v], got [%v]", expectedMessages[0], data.String()) t.Fatalf("Expected an %q, got %q", expectedMessages[0], data.String())
} }
// With terminal // With terminal
@ -238,7 +238,7 @@ func TestDisplayJSONMessagesStream(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if data.String() != expectedMessages[1] { if data.String() != expectedMessages[1] {
t.Fatalf("Expected an [%v], got [%v]", expectedMessages[1], data.String()) t.Fatalf("Expected an %q, got %q", expectedMessages[1], data.String())
} }
} }