From 6705477673be7c303369778f6f288ee600ce3893 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Wed, 19 Nov 2014 23:24:16 +0200 Subject: [PATCH] Fix misuses of format based logging functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tõnis Tiigi (github: tonistiigi) --- daemon/graphdriver/graphtest/graphtest.go | 2 +- image/image.go | 2 +- integration-cli/docker_cli_events_test.go | 2 +- integration-cli/docker_cli_nat_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/graphdriver/graphtest/graphtest.go b/daemon/graphdriver/graphtest/graphtest.go index 6407e1205d..16c7163130 100644 --- a/daemon/graphdriver/graphtest/graphtest.go +++ b/daemon/graphdriver/graphtest/graphtest.go @@ -33,7 +33,7 @@ func newDriver(t *testing.T, name string) *Driver { d, err := graphdriver.GetDriver(name, root, nil) if err != nil { if err == graphdriver.ErrNotSupported || err == graphdriver.ErrPrerequisites { - t.Skip("Driver %s not supported", name) + t.Skipf("Driver %s not supported", name) } t.Fatal(err) } diff --git a/image/image.go b/image/image.go index f16385bbfc..8cd9aa3755 100644 --- a/image/image.go +++ b/image/image.go @@ -112,7 +112,7 @@ func StoreImage(img *Image, layerData archive.ArchiveReader, root string) error checksum := layerTarSum.Sum(nil) if img.Checksum != "" && img.Checksum != checksum { - log.Warn("image layer checksum mismatch: computed %q, expected %q", checksum, img.Checksum) + log.Warnf("image layer checksum mismatch: computed %q, expected %q", checksum, img.Checksum) } img.Checksum = checksum diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go index 2c4111ce55..f2dc4e45a0 100644 --- a/integration-cli/docker_cli_events_test.go +++ b/integration-cli/docker_cli_events_test.go @@ -220,7 +220,7 @@ func TestEventsImagePull(t *testing.T) { since := time.Now().Unix() pullCmd := exec.Command(dockerBinary, "pull", "scratch") if out, _, err := runCommandWithOutput(pullCmd); err != nil { - t.Fatal("pulling the scratch image from has failed: %s, %v", out, err) + t.Fatalf("pulling the scratch image from has failed: %s, %v", out, err) } eventsCmd := exec.Command(dockerBinary, "events", diff --git a/integration-cli/docker_cli_nat_test.go b/integration-cli/docker_cli_nat_test.go index 01ebb73c74..7e3b595a80 100644 --- a/integration-cli/docker_cli_nat_test.go +++ b/integration-cli/docker_cli_nat_test.go @@ -11,7 +11,7 @@ import ( func TestNetworkNat(t *testing.T) { iface, err := net.InterfaceByName("eth0") if err != nil { - t.Skip("Test not running with `make test`. Interface eth0 not found: %s", err) + t.Skipf("Test not running with `make test`. Interface eth0 not found: %s", err) } ifaceAddrs, err := iface.Addrs()