github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Michael Hobbs
2015-04-17 20:17:42 -07:00
parent e27d0e6fa5
commit 99d2601f2f
5 changed files with 70 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/00_dokku-standard/commands
View File

@@ -194,7 +194,9 @@ case "$1" in
if [[ -f "$DOKKU_ROOT/VHOST" ]]; then if [[ -f "$DOKKU_ROOT/VHOST" ]]; then
echo "$SCHEME://$(< "$DOKKU_ROOT/VHOST")" echo "$SCHEME://$(< "$DOKKU_ROOT/VHOST")"
else else
echo "$SCHEME://$(< "$DOKKU_ROOT/HOSTNAME"):$(< "$DOKKU_ROOT/$APP/PORT")" for PORT_FILE in $DOKKU_ROOT/$APP/PORT.*; do
echo "$SCHEME://$(< "$DOKKU_ROOT/HOSTNAME"):$(< "$PORT_FILE")"
done
fi fi
;; ;;

30
tests/unit/client.bats
View File

@@ -131,10 +131,12 @@ teardown() {
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)" for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
echo "output: "$output run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
echo "status: "$status echo "output: "$output
assert_success echo "status: "$status
assert_success
done
} }
@test "(client) ps:stop" { @test "(client) ps:stop" {
@@ -143,10 +145,12 @@ teardown() {
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)" for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
echo "output: "$output run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
echo "status: "$status echo "output: "$output
assert_failure echo "status: "$status
assert_failure
done
} }
@test "(client) ps:restart" { @test "(client) ps:restart" {
@@ -155,8 +159,10 @@ teardown() {
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)" for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
echo "output: "$output run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
echo "status: "$status echo "output: "$output
assert_success echo "status: "$status
assert_success
done
} }

2
tests/unit/core_ports.bats
View File

@@ -111,7 +111,7 @@ teardown() {
@test "(core) dockerfile port exposure" { @test "(core) dockerfile port exposure" {
deploy_app dockerfile deploy_app dockerfile
run bash -c "grep upstream $DOKKU_ROOT/$TEST_APP/nginx.conf | grep 3000" run bash -c "grep -A1 upstream $DOKKU_ROOT/$TEST_APP/nginx.conf | grep 3000"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success

40
tests/unit/ps-buildstep.bats
View File

@@ -26,35 +26,43 @@ teardown() {
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)" for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
echo "output: "$output run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
echo "status: "$status echo "output: "$output
assert_failure echo "status: "$status
assert_failure
done
run bash -c "dokku ps:start $TEST_APP" run bash -c "dokku ps:start $TEST_APP"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)" for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
echo "output: "$output run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
echo "status: "$status echo "output: "$output
assert_success echo "status: "$status
assert_success
done
run bash -c "dokku ps:restart $TEST_APP" run bash -c "dokku ps:restart $TEST_APP"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)" for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
echo "output: "$output run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
echo "status: "$status echo "output: "$output
assert_success echo "status: "$status
assert_success
done
run bash -c "dokku ps:rebuild $TEST_APP" run bash -c "dokku ps:rebuild $TEST_APP"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)" for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
echo "output: "$output run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
echo "status: "$status echo "output: "$output
assert_success echo "status: "$status
assert_success
done
} }

40
tests/unit/ps-dockerfile.bats
View File

@@ -26,35 +26,43 @@ teardown() {
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)" for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
echo "output: "$output run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
echo "status: "$status echo "output: "$output
assert_failure echo "status: "$status
assert_failure
done
run bash -c "dokku ps:start $TEST_APP" run bash -c "dokku ps:start $TEST_APP"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)" for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
echo "output: "$output run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
echo "status: "$status echo "output: "$output
assert_success echo "status: "$status
assert_success
done
run bash -c "dokku ps:restart $TEST_APP" run bash -c "dokku ps:restart $TEST_APP"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)" for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
echo "output: "$output run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
echo "status: "$status echo "output: "$output
assert_success echo "status: "$status
assert_success
done
run bash -c "dokku ps:rebuild $TEST_APP" run bash -c "dokku ps:rebuild $TEST_APP"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)" for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do
echo "output: "$output run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)"
echo "status: "$status echo "output: "$output
assert_success echo "status: "$status
assert_success
done
} }