Merge pull request #14996 from chrisseto/master

Fix go vet errors

integration-cli/docker_cli_cp_utils.go

@@ -157,7 +157,7 @@ func makeTestContainer(c *check.C, options testContainerOptions) (containerID st
 		if status != 0 {
 			logs = "UNABLE TO GET LOGS"
 		}
-		c.Fatalf("failed to make test container, exit code (%d): %s", exitCode, logs)
+		c.Fatalf("failed to make test container, exit code (%s): %s", exitCode, logs)
 	}
 
 	return

pkg/nat/nat_test.go

@@ -409,11 +409,11 @@ func TestParseNetworkOptsNegativePorts(t *testing.T) {
 		t.Fail()
 	}
 	if len(ports) != 0 {
-		t.Logf("Expected nil got %s", len(ports))
+		t.Logf("Expected nil got %d", len(ports))
 		t.Fail()
 	}
 	if len(bindings) != 0 {
-		t.Logf("Expected 0 got %s", len(bindings))
+		t.Logf("Expected 0 got %d", len(bindings))
 		t.Fail()
 	}
 }