@@ -200,7 +200,7 @@ func (s *DockerRegistryAuthHtpasswdSuite) SetUpTest(c *check.C) {

 func (s *DockerRegistryAuthHtpasswdSuite) TearDownTest(c *check.C) {

 	if s.reg != nil {

 		out, err := s.d.Cmd("logout", privateRegistryURL)

-		c.Assert(err, check.IsNil, check.Commentf(out))

+		c.Assert(err, check.IsNil, check.Commentf("%s", out))

 		s.reg.Close()

 	}

 	if s.d != nil {

@@ -233,7 +233,7 @@ func (s *DockerRegistryAuthTokenSuite) SetUpTest(c *check.C) {

 func (s *DockerRegistryAuthTokenSuite) TearDownTest(c *check.C) {

 	if s.reg != nil {

 		out, err := s.d.Cmd("logout", privateRegistryURL)

-		c.Assert(err, check.IsNil, check.Commentf(out))

+		c.Assert(err, check.IsNil, check.Commentf("%s", out))

 		s.reg.Close()

 	}

 	if s.d != nil {

@@ -156,7 +156,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesUpdate(c *check.C) {

 	// create a different tag

 	for _, d := range daemons {

 		out, err := d.Cmd("tag", image1, image2)

-		c.Assert(err, checker.IsNil, check.Commentf(out))

+		c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	}

 	// create service

@@ -188,7 +188,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesUpdate(c *check.C) {

 	// Roll back to the previous version. This uses the CLI because

 	// rollback used to be a client-side operation.

 	out, err := daemons[0].Cmd("service", "update", "--detach", "--rollback", id)

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	// first batch

 	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].CheckRunningTaskImages, checker.DeepEquals,

@@ -297,7 +297,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesUpdateStartFirst(c *check.C) {

 	// Roll back to the previous version. This uses the CLI because

 	// rollback is a client-side operation.

 	out, err := d.Cmd("service", "update", "--detach", "--rollback", id)

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	// first batch

 	waitAndAssert(c, defaultReconciliationTimeout, d.CheckRunningTaskImages, checker.DeepEquals,

@@ -342,7 +342,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesFailedUpdate(c *check.C) {

 	// Roll back to the previous version. This uses the CLI because

 	// rollback used to be a client-side operation.

 	out, err := daemons[0].Cmd("service", "update", "--detach", "--rollback", id)

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].CheckRunningTaskImages, checker.DeepEquals,

 		map[string]int{image1: instances})

@@ -923,7 +923,7 @@ func (s *DockerSwarmSuite) TestAPISwarmHealthcheckNone(c *check.C) {

 	d := s.AddDaemon(c, true, true)

 	out, err := d.Cmd("network", "create", "-d", "overlay", "lb")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	instances := 1

 	d.CreateService(c, simpleTestService, setInstances(instances), func(s *swarm.Service) {

@@ -941,7 +941,7 @@ func (s *DockerSwarmSuite) TestAPISwarmHealthcheckNone(c *check.C) {

 	containers := d.ActiveContainers(c)

 	out, err = d.Cmd("exec", containers[0], "ping", "-c1", "-W3", "top")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 }

 func (s *DockerSwarmSuite) TestSwarmRepeatedRootRotation(c *check.C) {

@@ -25,7 +25,7 @@ func (s *DockerSwarmSuite) TestConfigCreateWithFile(c *check.C) {

 	testName := "test_config"

 	out, err := d.Cmd("config", "create", testName, testFile.Name())

 	c.Assert(err, checker.IsNil)

-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "", check.Commentf(out))

+	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "", check.Commentf("%s", out))

 	id := strings.TrimSpace(out)

 	config := d.GetConfig(c, id)

@@ -243,7 +243,7 @@ func (s *DockerSuite) TestCpFromSymlinkToDirectory(c *check.C) {

 	if err == nil {

 		out = fmt.Sprintf("target name was copied: %q - %q", stat.Mode(), stat.Name())

 	}

-	c.Assert(err, checker.NotNil, check.Commentf(out))

+	c.Assert(err, checker.NotNil, check.Commentf("%s", out))

 	// It *should* have copied the directory using the asked name "dir_link".

 	stat, err = os.Lstat(expectedPath)

@@ -315,7 +315,7 @@ func (s *DockerSuite) TestCpToSymlinkToDirectory(c *check.C) {

 	if err == nil {

 		out = fmt.Sprintf("target name was copied: %q - %q", stat.Mode(), stat.Name())

 	}

-	c.Assert(err, checker.NotNil, check.Commentf(out))

+	c.Assert(err, checker.NotNil, check.Commentf("%s", out))

 	// It *should* have copied the directory using the asked name "dir_link".

 	stat, err = os.Lstat(expectedPath)

@@ -75,7 +75,7 @@ func (s *DockerSuite) TestCreateShrinkRootfs(c *check.C) {

 	// Ensure this fails because of the defaultBaseFsSize is 10G

 	out, _, err := dockerCmdWithError("create", "--storage-opt", "size=5G", "busybox")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "Container size cannot be smaller than")

 }

@@ -225,10 +225,10 @@ func (s *DockerDaemonSuite) TestVolumePlugin(c *check.C) {

 	c.Assert(out, checker.Contains, pName)

 	out, err = s.d.Cmd("run", "--rm", "-v", volName+":"+destDir, "busybox", "touch", destDir+destFile)

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("run", "--rm", "-v", volName+":"+destDir, "busybox", "ls", destDir+destFile)

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 }

 func (s *DockerDaemonSuite) TestPluginVolumeRemoveOnRestart(c *check.C) {

@@ -237,26 +237,26 @@ func (s *DockerDaemonSuite) TestPluginVolumeRemoveOnRestart(c *check.C) {

 	s.d.Start(c, "--live-restore=true")

 	out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName)

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	c.Assert(strings.TrimSpace(out), checker.Contains, pName)

 	out, err = s.d.Cmd("volume", "create", "--driver", pName, "test")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	s.d.Restart(c, "--live-restore=true")

 	out, err = s.d.Cmd("plugin", "disable", pName)

-	c.Assert(err, checker.NotNil, check.Commentf(out))

+	c.Assert(err, checker.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "in use")

 	out, err = s.d.Cmd("volume", "rm", "test")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("plugin", "disable", pName)

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("plugin", "rm", pName)

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 }

 func existsMountpointWithPrefix(mountpointPrefix string) (bool, error) {

@@ -278,7 +278,7 @@ func (s *DockerDaemonSuite) TestPluginListFilterEnabled(c *check.C) {

 	s.d.Start(c)

 	out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pNameWithTag, "--disable")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	defer func() {

 		if out, err := s.d.Cmd("plugin", "remove", pNameWithTag); err != nil {

@@ -306,7 +306,7 @@ func (s *DockerDaemonSuite) TestPluginListFilterCapability(c *check.C) {

 	s.d.Start(c)

 	out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pNameWithTag, "--disable")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	defer func() {

 		if out, err := s.d.Cmd("plugin", "remove", pNameWithTag); err != nil {

@@ -142,10 +142,10 @@ func (s *DockerDaemonSuite) TestDaemonRestartUnlessStopped(c *check.C) {

 	testRun(map[string]bool{"top1": true, "top2": true}, "")

 	out, err = s.d.Cmd("stop", "top1")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("stop", "top2")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	// both stopped

 	testRun(map[string]bool{"top1": false, "top2": false}, "")

@@ -426,13 +426,13 @@ func (s *DockerDaemonSuite) TestDaemonIPv6FixedCIDR(c *check.C) {

 	out, err = s.d.Cmd("inspect", "--format", "{{.NetworkSettings.Networks.bridge.GlobalIPv6Address}}", "ipv6test")

 	out = strings.Trim(out, " \r\n'")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	ip := net.ParseIP(out)

 	c.Assert(ip, checker.NotNil, check.Commentf("Container should have a global IPv6 address"))

 	out, err = s.d.Cmd("inspect", "--format", "{{.NetworkSettings.Networks.bridge.IPv6Gateway}}", "ipv6test")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	c.Assert(strings.Trim(out, " \r\n'"), checker.Equals, "2001:db8:2::100", check.Commentf("Container should have a global IPv6 gateway"))

 }

@@ -738,7 +738,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeFixedCidr2(c *check.C) {

 	defer s.d.Restart(c)

 	out, err := d.Cmd("run", "-d", "--name", "bb", "busybox", "top")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	defer d.Cmd("stop", "bb")

 	out, err = d.Cmd("exec", "bb", "/bin/sh", "-c", "ifconfig eth0 | awk '/inet addr/{print substr($2,6)}'")

@@ -746,7 +746,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeFixedCidr2(c *check.C) {

 	c.Assert(out, checker.Equals, "10.2.2.0\n")

 	out, err = d.Cmd("run", "--rm", "busybox", "/bin/sh", "-c", "ifconfig eth0 | awk '/inet addr/{print substr($2,6)}'")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Equals, "10.2.2.2\n")

 }

@@ -763,7 +763,7 @@ func (s *DockerDaemonSuite) TestDaemonBridgeFixedCIDREqualBridgeNetwork(c *check

 	defer s.d.Restart(c)

 	out, err := d.Cmd("run", "-d", "busybox", "top")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	cid1 := strings.TrimSpace(out)

 	defer d.Cmd("stop", cid1)

 }

@@ -924,10 +924,10 @@ func (s *DockerDaemonSuite) TestDaemonICCLinkExpose(c *check.C) {

 		check.Commentf("iptables output should have contained %q, but was %q", regex, result.Combined()))

 	out, err := d.Cmd("run", "-d", "--expose", "4567", "--name", "icc1", "busybox", "nc", "-l", "-p", "4567")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	out, err = d.Cmd("run", "--link", "icc1:icc1", "busybox", "nc", "icc1", "4567")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 }

 func (s *DockerDaemonSuite) TestDaemonLinksIpTablesRulesWhenLinkAndUnlink(c *check.C) {

@@ -1033,7 +1033,7 @@ func (s *DockerDaemonSuite) TestDaemonLoggingDriverDefault(c *check.C) {

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("run", "--name=test", "busybox", "echo", "testline")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	id, err := s.d.GetIDByName("test")

 	c.Assert(err, check.IsNil)

@@ -1145,7 +1145,7 @@ func (s *DockerDaemonSuite) TestDaemonLoggingDriverNoneLogsError(c *check.C) {

 	s.d.StartWithBusybox(c, "--log-driver=none")

 	out, err := s.d.Cmd("run", "--name=test", "busybox", "echo", "testline")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("logs", "test")

 	c.Assert(err, check.NotNil, check.Commentf("Logs should fail with 'none' driver"))

@@ -1638,7 +1638,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartRmVolumeInUse(c *check.C) {

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("create", "-v", "test:/foo", "busybox")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	s.d.Restart(c)

@@ -1887,22 +1887,22 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithLinks(c *check.C) {

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("run", "-d", "--name=test", "busybox", "top")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("run", "--name=test2", "--link", "test:abc", "busybox", "sh", "-c", "ping -c 1 -w 1 abc")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	s.d.Restart(c)

 	// should fail since test is not running yet

 	out, err = s.d.Cmd("start", "test2")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("start", "test")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("start", "-a", "test2")

-	c.Assert(err, check.IsNil, check.Commentf(out))

-	c.Assert(strings.Contains(out, "1 packets transmitted, 1 packets received"), check.Equals, true, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

+	c.Assert(strings.Contains(out, "1 packets transmitted, 1 packets received"), check.Equals, true, check.Commentf("%s", out))

 }

 func (s *DockerDaemonSuite) TestDaemonRestartWithNames(c *check.C) {

@@ -1910,10 +1910,10 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithNames(c *check.C) {

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("create", "--name=test", "busybox")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("run", "-d", "--name=test2", "busybox", "top")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	test2ID := strings.TrimSpace(out)

 	out, err = s.d.Cmd("run", "-d", "--name=test3", "--link", "test2:abc", "busybox", "top")

@@ -1926,10 +1926,10 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithNames(c *check.C) {

 	c.Assert(err, check.NotNil, check.Commentf("expected error trying to create container with duplicate name"))

 	// this one is no longer needed, removing simplifies the remainder of the test

 	out, err = s.d.Cmd("rm", "-f", "test")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("ps", "-a", "--no-trunc")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	lines := strings.Split(strings.TrimSpace(out), "\n")[1:]

@@ -2112,24 +2112,24 @@ func (s *DockerDaemonSuite) TestRunLinksChanged(c *check.C) {

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("run", "-d", "--name=test", "busybox", "top")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("run", "--name=test2", "--link=test:abc", "busybox", "sh", "-c", "ping -c 1 abc")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "1 packets transmitted, 1 packets received")

 	out, err = s.d.Cmd("rm", "-f", "test")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("run", "-d", "--name=test", "busybox", "top")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("start", "-a", "test2")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, check.Not(checker.Contains), "1 packets transmitted, 1 packets received")

 	s.d.Restart(c)

 	out, err = s.d.Cmd("start", "-a", "test2")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, check.Not(checker.Contains), "1 packets transmitted, 1 packets received")

 }

@@ -2253,11 +2253,11 @@ func (s *DockerDaemonSuite) TestDaemonLogOptions(c *check.C) {

 	s.d.StartWithBusybox(c, "--log-driver=syslog", "--log-opt=syslog-address=udp://127.0.0.1:514")

 	out, err := s.d.Cmd("run", "-d", "--log-driver=json-file", "busybox", "top")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	id := strings.TrimSpace(out)

 	out, err = s.d.Cmd("inspect", "--format='{{.HostConfig.LogConfig}}'", id)

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "{json-file map[]}")

 }

@@ -2428,19 +2428,19 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) {

 	// Run with default runtime

 	out, err := s.d.Cmd("run", "--rm", "busybox", "ls")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	// Run with default runtime explicitly

 	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	// Run with oci (same path as default) but keep it around

 	out, err = s.d.Cmd("run", "--name", "oci-runtime-ls", "--runtime=oci", "busybox", "ls")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	// Run with "vm"

 	out, err = s.d.Cmd("run", "--rm", "--runtime=vm", "busybox", "ls")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory")

 	// Reset config to only have the default

@@ -2457,16 +2457,16 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) {

 	// Run with default runtime

 	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	// Run with "oci"

 	out, err = s.d.Cmd("run", "--rm", "--runtime=oci", "busybox", "ls")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "Unknown runtime specified oci")

 	// Start previously created container with oci

 	out, err = s.d.Cmd("start", "oci-runtime-ls")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "Unknown runtime specified oci")

 	// Check that we can't override the default runtime

@@ -2511,12 +2511,12 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) {

 	<-time.After(1 * time.Second)

 	out, err = s.d.Cmd("run", "--rm", "busybox", "ls")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory")

 	// Run with default runtime explicitly

 	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 }

 func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {

@@ -2524,19 +2524,19 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {

 	// Run with default runtime

 	out, err := s.d.Cmd("run", "--rm", "busybox", "ls")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	// Run with default runtime explicitly

 	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	// Run with oci (same path as default) but keep it around

 	out, err = s.d.Cmd("run", "--name", "oci-runtime-ls", "--runtime=oci", "busybox", "ls")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	// Run with "vm"

 	out, err = s.d.Cmd("run", "--rm", "--runtime=vm", "busybox", "ls")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory")

 	// Start a daemon without any extra runtimes

@@ -2545,16 +2545,16 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {

 	// Run with default runtime

 	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	// Run with "oci"

 	out, err = s.d.Cmd("run", "--rm", "--runtime=oci", "busybox", "ls")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "Unknown runtime specified oci")

 	// Start previously created container with oci

 	out, err = s.d.Cmd("start", "oci-runtime-ls")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "Unknown runtime specified oci")

 	// Check that we can't override the default runtime

@@ -2570,12 +2570,12 @@ func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {

 	s.d.StartWithBusybox(c, "--default-runtime=vm", "--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager")

 	out, err = s.d.Cmd("run", "--rm", "busybox", "ls")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory")

 	// Run with default runtime explicitly

 	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 }

 func (s *DockerDaemonSuite) TestDaemonRestartWithAutoRemoveContainer(c *check.C) {

@@ -2658,17 +2658,17 @@ func (s *DockerDaemonSuite) TestDaemonWithUserlandProxyPath(c *check.C) {

 	// custom one

 	s.d.StartWithBusybox(c, "--userland-proxy-path", newProxyPath)

 	out, err := s.d.Cmd("run", "-p", "5000:5000", "busybox:latest", "true")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	// try with the original one

 	s.d.Restart(c, "--userland-proxy-path", dockerProxyPath)

 	out, err = s.d.Cmd("run", "-p", "5000:5000", "busybox:latest", "true")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	// not exist

 	s.d.Restart(c, "--userland-proxy-path", "/does/not/exist")

 	out, err = s.d.Cmd("run", "-p", "5000:5000", "busybox:latest", "true")

-	c.Assert(err, checker.NotNil, check.Commentf(out))

+	c.Assert(err, checker.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "driver failed programming external connectivity on endpoint")

 	c.Assert(out, checker.Contains, "/does/not/exist: no such file or directory")

 }

@@ -50,11 +50,11 @@ func (s *DockerSuite) TestEventsTimestampFormats(c *check.C) {

 		containerEvents := eventActionsByIDAndType(c, events, name, "container")

 		c.Assert(containerEvents, checker.HasLen, 5, check.Commentf("events: %v", events))

-		c.Assert(containerEvents[0], checker.Equals, "create", check.Commentf(out))

-		c.Assert(containerEvents[1], checker.Equals, "attach", check.Commentf(out))

-		c.Assert(containerEvents[2], checker.Equals, "start", check.Commentf(out))

-		c.Assert(containerEvents[3], checker.Equals, "die", check.Commentf(out))

-		c.Assert(containerEvents[4], checker.Equals, "destroy", check.Commentf(out))

+		c.Assert(containerEvents[0], checker.Equals, "create", check.Commentf("%s", out))

+		c.Assert(containerEvents[1], checker.Equals, "attach", check.Commentf("%s", out))

+		c.Assert(containerEvents[2], checker.Equals, "start", check.Commentf("%s", out))

+		c.Assert(containerEvents[3], checker.Equals, "die", check.Commentf("%s", out))

+		c.Assert(containerEvents[4], checker.Equals, "destroy", check.Commentf("%s", out))

 	}

 }

@@ -93,11 +93,11 @@ func (s *DockerSuite) TestEventsContainerEvents(c *check.C) {

 	containerEvents := eventActionsByIDAndType(c, events, "container-events-test", "container")

 	c.Assert(containerEvents, checker.HasLen, 5, check.Commentf("events: %v", events))

-	c.Assert(containerEvents[0], checker.Equals, "create", check.Commentf(out))

-	c.Assert(containerEvents[1], checker.Equals, "attach", check.Commentf(out))

-	c.Assert(containerEvents[2], checker.Equals, "start", check.Commentf(out))

-	c.Assert(containerEvents[3], checker.Equals, "die", check.Commentf(out))

-	c.Assert(containerEvents[4], checker.Equals, "destroy", check.Commentf(out))

+	c.Assert(containerEvents[0], checker.Equals, "create", check.Commentf("%s", out))

+	c.Assert(containerEvents[1], checker.Equals, "attach", check.Commentf("%s", out))

+	c.Assert(containerEvents[2], checker.Equals, "start", check.Commentf("%s", out))

+	c.Assert(containerEvents[3], checker.Equals, "die", check.Commentf("%s", out))

+	c.Assert(containerEvents[4], checker.Equals, "destroy", check.Commentf("%s", out))

 }

 func (s *DockerSuite) TestEventsContainerEventsAttrSort(c *check.C) {

@@ -136,11 +136,11 @@ func (s *DockerSuite) TestEventsContainerEventsSinceUnixEpoch(c *check.C) {

 	containerEvents := eventActionsByIDAndType(c, events, "since-epoch-test", "container")

 	c.Assert(containerEvents, checker.HasLen, 5, check.Commentf("events: %v", events))

-	c.Assert(containerEvents[0], checker.Equals, "create", check.Commentf(out))

-	c.Assert(containerEvents[1], checker.Equals, "attach", check.Commentf(out))

-	c.Assert(containerEvents[2], checker.Equals, "start", check.Commentf(out))

-	c.Assert(containerEvents[3], checker.Equals, "die", check.Commentf(out))

-	c.Assert(containerEvents[4], checker.Equals, "destroy", check.Commentf(out))

+	c.Assert(containerEvents[0], checker.Equals, "create", check.Commentf("%s", out))

+	c.Assert(containerEvents[1], checker.Equals, "attach", check.Commentf("%s", out))

+	c.Assert(containerEvents[2], checker.Equals, "start", check.Commentf("%s", out))

+	c.Assert(containerEvents[3], checker.Equals, "die", check.Commentf("%s", out))

+	c.Assert(containerEvents[4], checker.Equals, "destroy", check.Commentf("%s", out))

 }

 func (s *DockerSuite) TestEventsImageTag(c *check.C) {

@@ -262,10 +262,10 @@ func (s *DockerSuite) TestEventsPluginOps(c *check.C) {

 	pluginEvents := eventActionsByIDAndType(c, events, pNameWithTag, "plugin")

 	c.Assert(pluginEvents, checker.HasLen, 4, check.Commentf("events: %v", events))

-	c.Assert(pluginEvents[0], checker.Equals, "pull", check.Commentf(out))

-	c.Assert(pluginEvents[1], checker.Equals, "enable", check.Commentf(out))

-	c.Assert(pluginEvents[2], checker.Equals, "disable", check.Commentf(out))

-	c.Assert(pluginEvents[3], checker.Equals, "remove", check.Commentf(out))

+	c.Assert(pluginEvents[0], checker.Equals, "pull", check.Commentf("%s", out))

+	c.Assert(pluginEvents[1], checker.Equals, "enable", check.Commentf("%s", out))

+	c.Assert(pluginEvents[2], checker.Equals, "disable", check.Commentf("%s", out))

+	c.Assert(pluginEvents[3], checker.Equals, "remove", check.Commentf("%s", out))

 }

 func (s *DockerSuite) TestEventsFilters(c *check.C) {

@@ -633,7 +633,7 @@ func (s *DockerSuite) TestEventsSpecialFiltersWithExecCreate(c *check.C) {

 	)

 	events := strings.Split(strings.TrimSpace(out), "\n")

-	c.Assert(len(events), checker.Equals, 1, check.Commentf(out))

+	c.Assert(len(events), checker.Equals, 1, check.Commentf("%s", out))

 	out, _ = dockerCmd(

 		c,

@@ -643,7 +643,7 @@ func (s *DockerSuite) TestEventsSpecialFiltersWithExecCreate(c *check.C) {

 		"--filter",

 		"event=exec_create",

 	)

-	c.Assert(len(events), checker.Equals, 1, check.Commentf(out))

+	c.Assert(len(events), checker.Equals, 1, check.Commentf("%s", out))

 }

 func (s *DockerSuite) TestEventsFilterImageInContainerAction(c *check.C) {

@@ -653,7 +653,7 @@ func (s *DockerSuite) TestEventsFilterImageInContainerAction(c *check.C) {

 	out, _ := dockerCmd(c, "events", "--filter", "image=busybox", "--since", since, "--until", daemonUnixTime(c))

 	events := strings.Split(strings.TrimSpace(out), "\n")

-	c.Assert(len(events), checker.GreaterThan, 1, check.Commentf(out))

+	c.Assert(len(events), checker.GreaterThan, 1, check.Commentf("%s", out))

 }

 func (s *DockerSuite) TestEventsContainerRestart(c *check.C) {

@@ -135,8 +135,8 @@ func (s *DockerSuite) TestEventsContainerFilterByName(c *check.C) {

 	c2 := strings.TrimSpace(cOut)

 	waitRun("bar")

 	out, _ := dockerCmd(c, "events", "-f", "container=foo", "--since=0", "--until", daemonUnixTime(c))

-	c.Assert(out, checker.Contains, c1, check.Commentf(out))

-	c.Assert(out, checker.Not(checker.Contains), c2, check.Commentf(out))

+	c.Assert(out, checker.Contains, c1, check.Commentf("%s", out))

+	c.Assert(out, checker.Not(checker.Contains), c2, check.Commentf("%s", out))

 }

 // #18453

@@ -351,7 +351,7 @@ func (s *DockerSuite) TestEventsFilterVolumeAndNetworkType(c *check.C) {

 	out, _ := dockerCmd(c, "events", "--filter", "type=volume", "--filter", "type=network", "--since", since, "--until", daemonUnixTime(c))

 	events := strings.Split(strings.TrimSpace(out), "\n")

-	c.Assert(len(events), checker.GreaterOrEqualThan, 2, check.Commentf(out))

+	c.Assert(len(events), checker.GreaterOrEqualThan, 2, check.Commentf("%s", out))

 	networkActions := eventActionsByIDAndType(c, events, "test-event-network-type", "network")

 	volumeActions := eventActionsByIDAndType(c, events, "test-event-volume-type", "volume")

@@ -164,7 +164,7 @@ func (s *DockerSuite) TestExecTTYCloseStdin(c *check.C) {

 	stdinRw.Close()

 	out, _, err := runCommandWithOutput(cmd)

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, _ = dockerCmd(c, "top", "exec_tty_stdin")

 	outArr := strings.Split(out, "\n")

@@ -517,7 +517,7 @@ func (s *DockerSuite) TestExecStartFails(c *check.C) {

 	c.Assert(waitRun(name), checker.IsNil)

 	out, _, err := dockerCmdWithError("exec", name, "no-such-cmd")

-	c.Assert(err, checker.NotNil, check.Commentf(out))

+	c.Assert(err, checker.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "executable file not found")

 }

@@ -298,7 +298,7 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverNamed(c *check.C) {

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("run", "--rm", "--name", "test-data", "-v", "external-volume-test:/tmp/external-volume-test", "--volume-driver", volumePluginName, "busybox:latest", "cat", "/tmp/external-volume-test/test")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, s.Server.URL)

 	_, err = s.d.Cmd("volume", "rm", "external-volume-test")

@@ -320,7 +320,7 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverUnnamed(c *check.C)

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("run", "--rm", "--name", "test-data", "-v", "/tmp/external-volume-test", "--volume-driver", volumePluginName, "busybox:latest", "cat", "/tmp/external-volume-test/test")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, s.Server.URL)

 	c.Assert(s.ec.activations, checker.Equals, 1)

@@ -334,13 +334,13 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverVolumesFrom(c *check

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("run", "--name", "vol-test1", "-v", "/foo", "--volume-driver", volumePluginName, "busybox:latest")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("run", "--rm", "--volumes-from", "vol-test1", "--name", "vol-test2", "busybox", "ls", "/tmp")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("rm", "-fv", "vol-test1")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	c.Assert(s.ec.activations, checker.Equals, 1)

 	c.Assert(s.ec.creations, checker.Equals, 1)

@@ -353,10 +353,10 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverDeleteContainer(c *c

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("run", "--name", "vol-test1", "-v", "/foo", "--volume-driver", volumePluginName, "busybox:latest")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("rm", "-fv", "vol-test1")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	c.Assert(s.ec.activations, checker.Equals, 1)

 	c.Assert(s.ec.creations, checker.Equals, 1)

@@ -453,7 +453,7 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverBindExternalVolume(c

 	}

 	out := inspectFieldJSON(c, "testing", "Mounts")

 	c.Assert(json.NewDecoder(strings.NewReader(out)).Decode(&mounts), checker.IsNil)

-	c.Assert(len(mounts), checker.Equals, 1, check.Commentf(out))

+	c.Assert(len(mounts), checker.Equals, 1, check.Commentf("%s", out))

 	c.Assert(mounts[0].Name, checker.Equals, "foo")

 	c.Assert(mounts[0].Driver, checker.Equals, volumePluginName)

 }

@@ -474,7 +474,7 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverList(c *check.C) {

 func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverGet(c *check.C) {

 	out, _, err := dockerCmdWithError("volume", "inspect", "dummy")

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "No such volume")

 	c.Assert(s.ec.gets, check.Equals, 1)

@@ -509,10 +509,10 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverGetEmptyResponse(c *

 	s.d.Start(c)

 	out, err := s.d.Cmd("volume", "create", "-d", volumePluginName, "abc2", "--opt", "ninja=1")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("volume", "inspect", "abc2")

-	c.Assert(err, checker.NotNil, check.Commentf(out))

+	c.Assert(err, checker.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "No such volume")

 }

@@ -525,11 +525,11 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverPathCalls(c *check.C

 	c.Assert(s.ec.paths, checker.Equals, 0)

 	out, err := s.d.Cmd("volume", "create", "test", "--driver=test-external-volume-driver")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	c.Assert(s.ec.paths, checker.Equals, 0)

 	out, err = s.d.Cmd("volume", "ls")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	c.Assert(s.ec.paths, checker.Equals, 0)

 }

@@ -537,7 +537,7 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverMountID(c *check.C)

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("run", "--rm", "-v", "external-volume-test:/tmp/external-volume-test", "--volume-driver", volumePluginName, "busybox:latest", "cat", "/tmp/external-volume-test/test")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")

 }

@@ -548,7 +548,7 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverCapabilities(c *chec

 	for i := 0; i < 3; i++ {

 		out, err := s.d.Cmd("volume", "create", "-d", volumePluginName, fmt.Sprintf("test%d", i))

-		c.Assert(err, checker.IsNil, check.Commentf(out))

+		c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 		c.Assert(s.ec.caps, checker.Equals, 1)

 		out, err = s.d.Cmd("volume", "inspect", "--format={{.Scope}}", fmt.Sprintf("test%d", i))

 		c.Assert(err, checker.IsNil)

@@ -564,10 +564,10 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverOutOfBandDelete(c *c

 	s.d.StartWithBusybox(c)

 	out, err := s.d.Cmd("volume", "create", "-d", driverName, "--name", "test")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("volume", "create", "-d", "local", "--name", "test")

-	c.Assert(err, checker.NotNil, check.Commentf(out))

+	c.Assert(err, checker.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "must be unique")

 	// simulate out of band volume deletion on plugin level

@@ -575,9 +575,9 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverOutOfBandDelete(c *c

 	// test re-create with same driver

 	out, err = s.d.Cmd("volume", "create", "-d", driverName, "--opt", "foo=bar", "--name", "test")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("volume", "inspect", "test")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	var vs []types.Volume

 	err = json.Unmarshal([]byte(out), &vs)

@@ -593,10 +593,10 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverOutOfBandDelete(c *c

 	// test create with different driver

 	out, err = s.d.Cmd("volume", "create", "-d", "local", "--name", "test")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	out, err = s.d.Cmd("volume", "inspect", "test")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	vs = nil

 	err = json.Unmarshal([]byte(out), &vs)

 	c.Assert(err, checker.IsNil)

@@ -610,9 +610,9 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverUnmountOnMountFail(c

 	s.d.Cmd("volume", "create", "-d", "test-external-volume-driver", "--opt=invalidOption=1", "--name=testumount")

 	out, _ := s.d.Cmd("run", "-v", "testumount:/foo", "busybox", "true")

-	c.Assert(s.ec.unmounts, checker.Equals, 0, check.Commentf(out))

+	c.Assert(s.ec.unmounts, checker.Equals, 0, check.Commentf("%s", out))

 	out, _ = s.d.Cmd("run", "-w", "/foo", "-v", "testumount:/foo", "busybox", "true")

-	c.Assert(s.ec.unmounts, checker.Equals, 0, check.Commentf(out))

+	c.Assert(s.ec.unmounts, checker.Equals, 0, check.Commentf("%s", out))

 }

 func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverUnmountOnCp(c *check.C) {

@@ -620,12 +620,12 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverUnmountOnCp(c *check

 	s.d.Cmd("volume", "create", "-d", "test-external-volume-driver", "--name=test")

 	out, _ := s.d.Cmd("run", "-d", "--name=test", "-v", "test:/foo", "busybox", "/bin/sh", "-c", "touch /test && top")

-	c.Assert(s.ec.mounts, checker.Equals, 1, check.Commentf(out))

+	c.Assert(s.ec.mounts, checker.Equals, 1, check.Commentf("%s", out))

 	out, _ = s.d.Cmd("cp", "test:/test", "/tmp/test")

-	c.Assert(s.ec.mounts, checker.Equals, 2, check.Commentf(out))

-	c.Assert(s.ec.unmounts, checker.Equals, 1, check.Commentf(out))

+	c.Assert(s.ec.mounts, checker.Equals, 2, check.Commentf("%s", out))

+	c.Assert(s.ec.unmounts, checker.Equals, 1, check.Commentf("%s", out))

 	out, _ = s.d.Cmd("kill", "test")

-	c.Assert(s.ec.unmounts, checker.Equals, 2, check.Commentf(out))

+	c.Assert(s.ec.unmounts, checker.Equals, 2, check.Commentf("%s", out))

 }

@@ -22,7 +22,7 @@ func (s *DockerSuite) TestLoginWithoutTTY(c *check.C) {

 func (s *DockerRegistryAuthHtpasswdSuite) TestLoginToPrivateRegistry(c *check.C) {

 	// wrong credentials

 	out, _, err := dockerCmdWithError("login", "-u", s.reg.Username(), "-p", "WRONGPASSWORD", privateRegistryURL)

-	c.Assert(err, checker.NotNil, check.Commentf(out))

+	c.Assert(err, checker.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "401 Unauthorized")

 	// now it's fine

@@ -59,7 +59,7 @@ func (s *DockerRegistryAuthHtpasswdSuite) TestLogoutWithExternalAuth(c *check.C)

 	// check I cannot pull anymore

 	out, err := s.d.Cmd("--config", tmp, "pull", repoName)

-	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(err, check.NotNil, check.Commentf("%s", out))

 	c.Assert(out, checker.Contains, "no basic auth credentials")

 }

@@ -327,7 +327,7 @@ func (s *DockerSuite) TestLogsWithDetails(c *check.C) {

 	out, _ := dockerCmd(c, "logs", "--details", "--timestamps", "test")

 	logFields := strings.Fields(strings.TrimSpace(out))

-	c.Assert(len(logFields), checker.Equals, 3, check.Commentf(out))

+	c.Assert(len(logFields), checker.Equals, 3, check.Commentf("%s", out))

 	details := strings.Split(logFields[1], ",")

 	c.Assert(details, checker.HasLen, 2)

@@ -847,11 +847,11 @@ func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *

 	// but discovery is on when connecting to non default bridge network

 	network := "anotherbridge"

 	out, err = s.d.Cmd("network", "create", network)

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	defer s.d.Cmd("network", "rm", network)

 	out, err = s.d.Cmd("network", "connect", network, cid1)

-	c.Assert(err, check.IsNil, check.Commentf(out))

+	c.Assert(err, check.IsNil, check.Commentf("%s", out))

 	hosts, err = s.d.Cmd("exec", cid1, "cat", hostsFile)

 	c.Assert(err, checker.IsNil)

@@ -1063,14 +1063,14 @@ func (s *DockerSuite) TestInspectAPIMultipleNetworks(c *check.C) {

 func connectContainerToNetworks(c *check.C, d *daemon.Daemon, cName string, nws []string) {

 	// Run a container on the default network

 	out, err := d.Cmd("run", "-d", "--name", cName, "busybox", "top")

-	c.Assert(err, checker.IsNil, check.Commentf(out))

+	c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	// Attach the container to other networks

 	for _, nw := range nws {

 		out, err = d.Cmd("network", "create", nw)

-		c.Assert(err, checker.IsNil, check.Commentf(out))

+		c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 		out, err = d.Cmd("network", "connect", nw, cName)

-		c.Assert(err, checker.IsNil, check.Commentf(out))

+		c.Assert(err, checker.IsNil, check.Commentf("%s", out))

 	}

 }

@@ -1078,7 +1078,7 @@ func verifyContainerIsConnectedToNetworks(c *check.C, d *daemon.Daemon, cName st

 	// Verify container is connected to all the networks