From 5d10f47b32b0bb64129c306ba9cdaf393267a57e Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Mon, 4 May 2015 23:05:17 -0700 Subject: [PATCH] integration helpers: move the docker_ functions together Signed-off-by: Andrea Luzzardi --- test/integration/helpers.bash | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/helpers.bash b/test/integration/helpers.bash index 11920f70f7..95648a1342 100644 --- a/test/integration/helpers.bash +++ b/test/integration/helpers.bash @@ -40,6 +40,11 @@ function docker_host() { command docker "$@" } +# Run the docker CLI against swarm. +function docker_swarm() { + docker -H $SWARM_HOST "$@" +} + # Run the swarm binary. You must NOT fork this command (swarm foo &) as the PID # ($!) will be the one of the subshell instead of swarm and you won't be able # to kill it. @@ -110,11 +115,6 @@ function swarm_join_cleanup() { done } -# Run the docker CLI against swarm. -function docker_swarm() { - docker -H $SWARM_HOST "$@" -} - # Start N docker engines. function start_docker() { local current=${#DOCKER_CONTAINERS[@]}