From a9c1ed0c6d05358556d3f495bb12521edb00bd6d Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Sat, 7 Feb 2015 14:37:20 -0800 Subject: [PATCH] [ci skip] comment out skipped tests as we pay the cost for setup() and teardown() anyway --- tests/unit/client.bats | 22 +++++++++++----------- tests/unit/ps.bats | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/unit/client.bats b/tests/unit/client.bats index 6335b9aa3..4d5e5e40c 100644 --- a/tests/unit/client.bats +++ b/tests/unit/client.bats @@ -113,17 +113,17 @@ teardown() { assert_success } -@test "dokku client (ps)" { - # CI support: 'Ah. I just spoke with our Docker expert -- - # looks like docker exec is built to work with docker-under-libcontainer, - # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry - skip "circleci does not support docker exec at the moment." - deploy_app - run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh ps $TEST_APP | grep -q 'node web.js'" - echo "output: "$output - echo "status: "$status - assert_success -} +# @test "dokku client (ps)" { +# # CI support: 'Ah. I just spoke with our Docker expert -- +# # looks like docker exec is built to work with docker-under-libcontainer, +# # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry +# skip "circleci does not support docker exec at the moment." +# deploy_app +# run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh ps $TEST_APP | grep -q 'node web.js'" +# echo "output: "$output +# echo "status: "$status +# assert_success +# } @test "dokku client (ps:start)" { deploy_app diff --git a/tests/unit/ps.bats b/tests/unit/ps.bats index 915563a61..a468b1ccf 100644 --- a/tests/unit/ps.bats +++ b/tests/unit/ps.bats @@ -10,16 +10,16 @@ teardown() { destroy_app } -@test "ps" { - # CI support: 'Ah. I just spoke with our Docker expert -- - # looks like docker exec is built to work with docker-under-libcontainer, - # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry - skip "circleci does not support docker exec at the moment." - run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\"" - echo "output: "$output - echo "status: "$status - assert_success -} +# @test "ps" { +# # CI support: 'Ah. I just spoke with our Docker expert -- +# # looks like docker exec is built to work with docker-under-libcontainer, +# # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry +# skip "circleci does not support docker exec at the moment." +# run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\"" +# echo "output: "$output +# echo "status: "$status +# assert_success +# } @test "ps:start" { run bash -c "dokku ps:stop $TEST_APP"