From 33258663f42e9c8aebc2a0b7b83a7b53a5b1f8a7 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Mon, 20 Apr 2015 20:57:12 -0700 Subject: [PATCH] uncomment my accidental comment out --- tests/unit/ps-buildstep.bats | 86 ++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/tests/unit/ps-buildstep.bats b/tests/unit/ps-buildstep.bats index f702cf0ca..e10534239 100644 --- a/tests/unit/ps-buildstep.bats +++ b/tests/unit/ps-buildstep.bats @@ -21,52 +21,52 @@ teardown() { # assert_success # } -# @test "(ps) buildstep" { -# deploy_app -# run bash -c "dokku ps:stop $TEST_APP" -# echo "output: "$output -# echo "status: "$status -# assert_success -# for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do -# run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)" -# echo "output: "$output -# echo "status: "$status -# assert_failure -# done +@test "(ps) buildstep" { + deploy_app + run bash -c "dokku ps:stop $TEST_APP" + echo "output: "$output + echo "status: "$status + assert_success + for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do + run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)" + echo "output: "$output + echo "status: "$status + assert_failure + done -# run bash -c "dokku ps:start $TEST_APP" -# echo "output: "$output -# echo "status: "$status -# assert_success -# for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do -# run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)" -# echo "output: "$output -# echo "status: "$status -# assert_success -# done + run bash -c "dokku ps:start $TEST_APP" + echo "output: "$output + echo "status: "$status + assert_success + for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do + run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)" + echo "output: "$output + echo "status: "$status + assert_success + done -# run bash -c "dokku ps:restart $TEST_APP" -# echo "output: "$output -# echo "status: "$status -# assert_success -# for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do -# run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)" -# echo "output: "$output -# echo "status: "$status -# assert_success -# done + run bash -c "dokku ps:restart $TEST_APP" + echo "output: "$output + echo "status: "$status + assert_success + for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do + run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)" + echo "output: "$output + echo "status: "$status + assert_success + done -# run bash -c "dokku ps:rebuild $TEST_APP" -# echo "output: "$output -# echo "status: "$status -# assert_success -# for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do -# run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)" -# echo "output: "$output -# echo "status: "$status -# assert_success -# done -# } + run bash -c "dokku ps:rebuild $TEST_APP" + echo "output: "$output + echo "status: "$status + assert_success + for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.*; do + run bash -c "docker ps -q --no-trunc | grep -q $(< $CID_FILE)" + echo "output: "$output + echo "status: "$status + assert_success + done +} @test "(ps:scale) buildstep" { run bash -c "dokku ps:scale $TEST_APP web=2 worker=2"