Merge pull request #955 from progrium/mh-small-style-refactor

quick style refactor
This commit is contained in:
Michael Hobbs committed 2015-02-07 14:40:04 -08:00
commit b10120af12
8 files changed
+59 -29

No files matched your search

+20
View File
@@ -0,0 +1,20 @@
#!/usr/bin/env bash
case "$CIRCLE_NODE_INDEX" in
0)
echo "=====> make unit-tests"
sudo -E make -e unit-tests
;;
1)
echo "=====> make deploy-tests (buildstep release)"
sudo -E make -e deploy-tests
;;
2)
echo "=====> make deploy-tests (buildstep master)"
docker rmi -f progrium/buildstep && \
sudo -E BUILD_STACK=true make -e stack && \
sudo -E make -e deploy-tests
;;
esac
+1 -1
View File
@@ -19,7 +19,7 @@ APP=lifecycle-app
}
@test "apps:destroy" {
run bash -c "echo $APP | dokku apps:destroy $APP"
run bash -c "dokku --force apps:destroy $APP"
echo "output: "$output
echo "status: "$status
assert_success
+2 -2
View File
@@ -36,7 +36,7 @@ teardown() {
}
@test "dokku client (apps:destroy)" {
run ./contrib/dokku_client.sh apps:destroy $TEST_APP force
run ./contrib/dokku_client.sh -- --force apps:destroy $TEST_APP
echo "output: "$output
echo "status: "$status
assert_success
@@ -171,7 +171,7 @@ teardown() {
echo "output: "$output
echo "status: "$status
assert_success
run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:destroy force"
run bash -c "echo ${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh --force apps:destroy"
echo "output: "$output
echo "status: "$status
assert_success