From cc850d8d72b7569cd326aad405624c0847451aba Mon Sep 17 00:00:00 2001 From: unclejack Date: Wed, 23 Jul 2014 01:54:56 +0300 Subject: [PATCH] integcli: add some more docker utils Docker-DCO-1.1-Signed-off-by: Cristian Staretu (github: unclejack) Upstream-commit: f60c8e9e6154629de8eaa19bfa0f52b2be4791e5 Component: engine --- components/engine/integration-cli/docker_utils.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/components/engine/integration-cli/docker_utils.go b/components/engine/integration-cli/docker_utils.go index e3e5b36d93..e259c97ad9 100644 --- a/components/engine/integration-cli/docker_utils.go +++ b/components/engine/integration-cli/docker_utils.go @@ -87,12 +87,26 @@ func pullImageIfNotExist(image string) (err error) { return } +// deprecated, use dockerCmd instead func cmd(t *testing.T, args ...string) (string, int, error) { + return dockerCmd(t, args...) +} + +func dockerCmd(t *testing.T, args ...string) (string, int, error) { out, status, err := runCommandWithOutput(exec.Command(dockerBinary, args...)) errorOut(err, t, fmt.Sprintf("'%s' failed with errors: %v (%v)", strings.Join(args, " "), err, out)) return out, status, err } +// execute a docker command in a directory +func dockerCmdInDir(t *testing.T, path string, args ...string) (string, int, error) { + dockerCommand := exec.Command(dockerBinary, args...) + dockerCommand.Dir = path + out, status, err := runCommandWithOutput(dockerCommand) + errorOut(err, t, fmt.Sprintf("'%s' failed with errors: %v (%v)", strings.Join(args, " "), err, out)) + return out, status, err +} + func findContainerIp(t *testing.T, id string) string { cmd := exec.Command(dockerBinary, "inspect", "--format='{{ .NetworkSettings.IPAddress }}'", id) out, _, err := runCommandWithOutput(cmd)