github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing a lot of string formatting issues with regards to:

Browse Source 
* Improper format specifier (e.g. %s for bools or %s for ints)
  * More or less parameters than format specifiers
  * Not calling a formatting function when it should have (e.g. Error() instead of Errorf())
This commit is contained in:
Kris Rousey
2015-03-31 15:32:02 -07:00
parent 903fb42a36
commit 6904c4d585
26 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/server_test.go
View File

@@ -448,7 +448,7 @@ func TestPodsInfo(t *testing.T) {
}
result := string(body)
if !strings.Contains(result, "pod level status currently unimplemented") {
t.Errorf("expected body contains %s, got %d", "pod level status currently unimplemented", result)
t.Errorf("expected body contains pod level status currently unimplemented, got %s", result)
}
}
@@ -477,7 +477,7 @@ func TestHealthCheck(t *testing.T) {
}
result := string(body)
if !strings.Contains(result, "ok") {
t.Errorf("expected body contains %s, got %d", "ok", result)
t.Errorf("expected body contains ok, got %s", result)
}
//Test with incorrect hostname
@@ -822,7 +822,7 @@ func TestServeExecInContainer(t *testing.T) {
}
if e, a := test.responseStatusCode, resp.StatusCode; e != a {
t.Fatalf("%d: response status: expected %v, got %v", e, a)
t.Fatalf("%d: response status: expected %v, got %v", i, e, a)
}
if test.responseStatusCode != http.StatusSwitchingProtocols {
@@ -987,7 +987,7 @@ func TestServePortForward(t *testing.T) {
p, err := strconv.ParseUint(test.port, 10, 16)
if err != nil {
t.Fatalf("%d: error parsing port string '%s': %v", i, port, err)
t.Fatalf("%d: error parsing port string '%s': %v", i, test.port, err)
}
if e, a := uint16(p), port; e != a {
t.Fatalf("%d: port: expected '%v', got '%v'", i, e, a)
@@ -1035,7 +1035,7 @@ func TestServePortForward(t *testing.T) {
t.Fatalf("Unexpected error creating streaming connection: %s", err)
}
if conn == nil {
t.Fatal("%d: Unexpected nil connection", i)
t.Fatalf("%d: Unexpected nil connection", i)
}
defer conn.Close()