diff --git a/integration/105_launch_sans_weave_test.sh b/integration/105_launch_sans_weave_test.sh new file mode 100755 index 000000000..6f4987f5e --- /dev/null +++ b/integration/105_launch_sans_weave_test.sh @@ -0,0 +1,14 @@ +#! /bin/bash + +. ./config.sh + +start_suite "Launch scope (without weave installed) and check it boots" + +assert_raises "run_on $HOST1 \ + PATH=/usr/local/scope/bin:/usr/sbin:/usr/bin:/sbin:/bin \ + DOCKER_HOST=tcp://$HOST1:$DOCKER_PORT \ + scope launch" + +assert_raises "curl $HOST1:4040" + +end_suite diff --git a/integration/setup.sh b/integration/setup.sh index 3a82d99b5..b4222bb32 100755 --- a/integration/setup.sh +++ b/integration/setup.sh @@ -8,10 +8,11 @@ echo Copying scope images and scripts to hosts for HOST in $HOSTS; do docker_on $HOST load -i ../scope.tar upload_executable $HOST ../scope + upload_executable $HOST ../scope /usr/local/scope/bin/scope done echo Installing weave for HOST in $HOSTS; do - run_on $HOST "sudo curl -L git.io/weave -o /usr/local/bin/weave" + run_on $HOST "sudo curl -sL git.io/weave -o /usr/local/bin/weave" run_on $HOST "sudo chmod a+x /usr/local/bin/weave" done