Merge pull request #5176 from unclejack/check_before_pulling

cli integ: don't fetch busybox if it exists
Upstream-commit: 2d20c92d29775f9c4c2fff3c4809d507138e1523
Component: engine
This commit is contained in:
Tianon Gravi
2014-04-13 09:28:30 -06:00
@@ -29,8 +29,11 @@ bundle_test_integration_cli() {
# pull the busybox image before running the tests
sleep 2
( set -x; docker pull busybox )
if ! docker inspect busybox &> /dev/null; then
( set -x; docker pull busybox )
fi
bundle_test_integration_cli
DOCKERD_PID=$(set -x; cat $DEST/docker.pid)