kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Update test-integration-cli bundlescript for consistency with other bundlescripts and slightly more verbose logging of which commands were executed

Browse source 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
This commit is contained in:
Tianon Gravi 2014-04-07 23:10:40 -06:00
parent be3a5a2e37
commit 4c3eb7db67
1 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
hack/make/test-integration-cli
View file

@ -4,9 +4,6 @@ DEST=$1
set -e set -e
# subshell so that we can export PATH without breaking other things
(
export PATH="$DEST/../binary:$DEST/../dynbinary:$PATH"
DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs} DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs}
DOCKER_EXECDRIVER=${DOCKER_EXECDRIVER:-native} DOCKER_EXECDRIVER=${DOCKER_EXECDRIVER:-native}
@ -14,22 +11,30 @@ bundle_test_integration_cli() {
go_test_dir ./integration-cli go_test_dir ./integration-cli
} }
if ! command -v docker &> /dev/null; then # subshell so that we can export PATH without breaking other things
echo >&2 'error: binary or dynbinary must be run before test-integration-cli' (
false export PATH="$DEST/../binary:$DEST/../dynbinary:$PATH"
fi
if ! command -v docker &> /dev/null; then
echo "running cli integration tests using graphdriver: '$DOCKER_GRAPHDRIVER' and execdriver: '$DOCKER_EXECDRIVER'" echo >&2 'error: binary or dynbinary must be run before test-integration-cli'
docker -d -D -s $DOCKER_GRAPHDRIVER -e $DOCKER_EXECDRIVER -p $DEST/docker.pid &> $DEST/docker.log & false
fi
# pull the busybox image before running the tests
sleep 2 ( set -x; exec \
docker pull busybox docker --daemon --debug \
--storage-driver "$DOCKER_GRAPHDRIVER" \
bundle_test_integration_cli 2>&1 \ --exec-driver "$DOCKER_EXECDRIVER" \
| tee $DEST/test.log --pidfile "$DEST/docker.pid" \
&> "$DEST/docker.log"
DOCKERD_PID=$(cat $DEST/docker.pid) ) &
kill $DOCKERD_PID
wait $DOCKERD_PID || true # pull the busybox image before running the tests
) sleep 2
( set -x; docker pull busybox )
bundle_test_integration_cli
DOCKERD_PID=$(set -x; cat $DEST/docker.pid)
( set -x; kill $DOCKERD_PID )
wait $DOCKERD_PID || true
) 2>&1 | tee $DEST/test.log