diff --git a/test/cli_container_commit_test.go b/test/cli_container_commit_test.go index 93a45300a..f48fae3d2 100644 --- a/test/cli_container_commit_test.go +++ b/test/cli_container_commit_test.go @@ -44,7 +44,8 @@ func (suite *PouchCommitSuite) TestCommitNewFile(c *check.C) { cname := "TestCommitNewFile" image := "foo:newfile" - command.PouchRun("run", "--name", cname, busyboxImage, "/bin/sh", "-c", "echo a > /foo").Assert(c, icmd.Success) + command.PouchRun("run", "--name", cname, busyboxImage, + "/bin/sh", "-c", "echo a > /foo").Assert(c, icmd.Success) defer DelContainerForceMultyTime(c, cname) ret := command.PouchRun("commit", cname, image) @@ -64,7 +65,8 @@ func (suite *PouchCommitSuite) TestCommitHardLink(c *check.C) { cname := "TestCommitHardLink" image := "foo:hardlink" - ret := command.PouchRun("run", "-t", "--name", cname, "busybox", "sh", "-c", "touch file1 && ln file1 file2 && ls -di file1 file2") + ret := command.PouchRun("run", "-t", "--name", cname, busyboxImage, + "sh", "-c", "touch file1 && ln file1 file2 && ls -di file1 file2") ret.Assert(c, icmd.Success) defer DelContainerForceMultyTime(c, cname) @@ -81,7 +83,8 @@ func (suite *PouchCommitSuite) TestCommitHardLink(c *check.C) { imageID := strings.TrimSpace(ret.Stdout()) nname := "fromHardlink" - ret = command.PouchRun("run", "-t", "--name", nname, imageID, "sh", "-c", "ls -di file1 file2") + ret = command.PouchRun("run", "-t", "--name", nname, imageID, + "sh", "-c", "ls -di file1 file2") ret.Assert(c, icmd.Success) output = ret.Stdout() splits = strings.SplitN(strings.TrimSpace(output), " ", 2) @@ -97,7 +100,8 @@ func (suite *PouchCommitSuite) TestCommitBindMount(c *check.C) { cname := "TestCommitBindMount" image := "foo:mount" - command.PouchRun("run", "--name", cname, "-v", "/dev/null:/tmp/h1", busyboxImage).Assert(c, icmd.Success) + command.PouchRun("run", "--name", cname, + "-v", "/dev/null:/tmp/h1", busyboxImage).Assert(c, icmd.Success) defer DelContainerForceMultyTime(c, cname) ret := command.PouchRun("commit", cname, image) diff --git a/test/cli_logs_test.go b/test/cli_logs_test.go index b70107ae6..c725cd8c6 100644 --- a/test/cli_logs_test.go +++ b/test/cli_logs_test.go @@ -201,7 +201,12 @@ func (suite *PouchLogsSuite) TestLogsOpt(c *check.C) { func (suite *PouchLogsSuite) TestLogsWithDetails(c *check.C) { cname := "TestLogsWithDetails" - res := command.PouchRun("run", "--name", cname, "--label", "foo=bar", "-e", "baz=qux", "--log-opt", "labels=foo", "--log-opt", "env=baz", "busybox", "echo", "hello") + res := command.PouchRun("run", "--name", cname, + "--label", "foo=bar", + "-e", "baz=qux", + "--log-opt", "labels=foo", + "--log-opt", "env=baz", + busyboxImage, "echo", "hello") res.Assert(c, icmd.Success) defer DelContainerForceMultyTime(c, cname) @@ -219,7 +224,7 @@ func (suite *PouchLogsSuite) TestLogsWithDetails(c *check.C) { command.PouchRun("run", "--name", cnameOfEmptyDetails, - "busybox", + busyboxImage, "echo", "hello", ).Assert(c, icmd.Success) defer DelContainerForceMultyTime(c, cnameOfEmptyDetails)