From a7ae7fed7311551975d2bccb7417c328be3ea478 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Fri, 12 Dec 2014 10:58:56 -0800 Subject: [PATCH] Fix vet errors about formatting directives Signed-off-by: Alexander Morozov --- daemon/utils_test.go | 2 +- integration-cli/docker_cli_attach_test.go | 2 +- integration-cli/docker_cli_build_test.go | 2 +- integration-cli/docker_cli_exec_test.go | 2 +- integration-cli/docker_cli_run_test.go | 2 +- pkg/symlink/fs_test.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/utils_test.go b/daemon/utils_test.go index 8a2fa719ed..28a15c64e1 100644 --- a/daemon/utils_test.go +++ b/daemon/utils_test.go @@ -16,7 +16,7 @@ func TestMergeLxcConfig(t *testing.T) { out, err := mergeLxcConfIntoOptions(hostConfig) if err != nil { - t.Fatalf("Failed to merge Lxc Config ", err) + t.Fatalf("Failed to merge Lxc Config: %s", err) } cpuset := out[0] diff --git a/integration-cli/docker_cli_attach_test.go b/integration-cli/docker_cli_attach_test.go index 0530d3896e..cf21cda588 100644 --- a/integration-cli/docker_cli_attach_test.go +++ b/integration-cli/docker_cli_attach_test.go @@ -122,7 +122,7 @@ func TestAttachTtyWithoutStdin(t *testing.T) { if out, _, err := runCommandWithOutput(cmd); err == nil { t.Fatal("attach should have failed") } else if !strings.Contains(out, expected) { - t.Fatal("attach failed with error %q: expected %q", out, expected) + t.Fatalf("attach failed with error %q: expected %q", out, expected) } }() diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 0fd5b1363d..bf64bf1eed 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -3799,7 +3799,7 @@ func TestBuildStderr(t *testing.T) { t.Fatal(err) } if stderr != "" { - t.Fatal("Stderr should have been empty, instead its: %q", stderr) + t.Fatalf("Stderr should have been empty, instead its: %q", stderr) } logDone("build - testing stderr") } diff --git a/integration-cli/docker_cli_exec_test.go b/integration-cli/docker_cli_exec_test.go index b07f215a36..747ad4ff8c 100644 --- a/integration-cli/docker_cli_exec_test.go +++ b/integration-cli/docker_cli_exec_test.go @@ -339,7 +339,7 @@ func TestExecTtyWithoutStdin(t *testing.T) { if out, _, err := runCommandWithOutput(cmd); err == nil { t.Fatal("exec should have failed") } else if !strings.Contains(out, expected) { - t.Fatal("exec failed with error %q: expected %q", out, expected) + t.Fatalf("exec failed with error %q: expected %q", out, expected) } }() diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 0b56f235fe..5aa7b228fa 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -2759,7 +2759,7 @@ func TestRunTtyWithPipe(t *testing.T) { if out, _, err := runCommandWithOutput(cmd); err == nil { t.Fatal("run should have failed") } else if !strings.Contains(out, expected) { - t.Fatal("run failed with error %q: expected %q", out, expected) + t.Fatalf("run failed with error %q: expected %q", out, expected) } }() diff --git a/pkg/symlink/fs_test.go b/pkg/symlink/fs_test.go index 6b2496c4e0..89209484a3 100644 --- a/pkg/symlink/fs_test.go +++ b/pkg/symlink/fs_test.go @@ -311,7 +311,7 @@ func TestFollowSymlinkEmpty(t *testing.T) { t.Fatal(err) } if res != wd { - t.Fatal("expected %q got %q", wd, res) + t.Fatalf("expected %q got %q", wd, res) } }