From c6cde91b7d2cb3671dc55cafc5ab693f9cb17cc8 Mon Sep 17 00:00:00 2001 From: Lei Date: Sat, 18 Jul 2015 10:48:28 +0800 Subject: [PATCH] Add dockerCmdWithStdoutStderr function Signed-off-by: Lei Jitang --- integration-cli/docker_utils.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go index 70831cf073701..0fff986c269a9 100644 --- a/integration-cli/docker_utils.go +++ b/integration-cli/docker_utils.go @@ -554,6 +554,12 @@ func dockerCmdWithError(c *check.C, args ...string) (string, int, error) { return runCommandWithOutput(exec.Command(dockerBinary, args...)) } +func dockerCmdWithStdoutStderr(c *check.C, args ...string) (string, string, int) { + stdout, stderr, status, err := runCommandWithStdoutStderr(exec.Command(dockerBinary, args...)) + c.Assert(err, check.IsNil, check.Commentf("%q failed with errors: %s, %v", strings.Join(args, " "), stderr, err)) + return stdout, stderr, status +} + func dockerCmd(c *check.C, args ...string) (string, int) { out, status, err := runCommandWithOutput(exec.Command(dockerBinary, args...)) c.Assert(err, check.IsNil, check.Commentf("%q failed with errors: %s, %v", strings.Join(args, " "), out, err))