소스 검색

Merge pull request #9251 from tonistiigi/use-format-logging-functions

Fix misuses of format based logging functions
Jessie Frazelle 10 년 전
부모
커밋
eb3bbde6d1
4개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      daemon/graphdriver/graphtest/graphtest.go
  2. 1 1
      image/image.go
  3. 1 1
      integration-cli/docker_cli_events_test.go
  4. 1 1
      integration-cli/docker_cli_nat_test.go

+ 1 - 1
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)
 	}

+ 1 - 1
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

+ 1 - 1
integration-cli/docker_cli_events_test.go

@@ -232,7 +232,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",

+ 1 - 1
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()