From 8c547ff7b856caab71eefd20e7d949b9b76f8fc3 Mon Sep 17 00:00:00 2001 From: Juan Batiz-Benet Date: Sat, 29 Aug 2015 06:13:46 +0200 Subject: [PATCH] t0062-daemon-api.sh tabs License: MIT Signed-off-by: Juan Batiz-Benet --- test/sharness/t0062-daemon-api.sh | 60 +++++++++++++++---------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/test/sharness/t0062-daemon-api.sh b/test/sharness/t0062-daemon-api.sh index f97ac9b95..a289ed3b1 100755 --- a/test/sharness/t0062-daemon-api.sh +++ b/test/sharness/t0062-daemon-api.sh @@ -16,32 +16,32 @@ api_fromcfg=$(ipfs config Addresses.API) peerid=$(ipfs config Identity.PeerID) test_client() { - args="$@" - printf $peerid >expected - ipfs $args id -f="" >actual - test_cmp expected actual + args="$@" + printf $peerid >expected + ipfs $args id -f="" >actual + test_cmp expected actual } test_client_must_fail() { - args="$@" - echo "Error: api not running" >expected_err - test_must_fail ipfs $args id -f="" >actual 2>actual_err - test_cmp expected_err actual_err + args="$@" + echo "Error: api not running" >expected_err + test_must_fail ipfs $args id -f="" >actual 2>actual_err + test_cmp expected_err actual_err } # first, test things without daemon, without /api file test_expect_success "client should work (daemon off, no /api file, no --api)" ' - test_client + test_client ' test_expect_success "client --api fromcfg should err (daemon off, no /api file)" ' - test_client_must_fail --api "$api_fromcfg" + test_client_must_fail --api "$api_fromcfg" ' test_expect_success "client --api unreachable should err (daemon off, no /api file)" ' - test_client_must_fail --api "$api_unreachable" + test_client_must_fail --api "$api_unreachable" ' # then, test things with daemon, with /api file @@ -49,24 +49,24 @@ test_expect_success "client --api unreachable should err (daemon off, no /api fi test_launch_ipfs_daemon test_expect_success "'ipfs daemon' creates api file" ' - test -f ".ipfs/api" + test -f ".ipfs/api" ' test_expect_success "api file looks good" ' - printf "$ADDR_API" >expected && - test_cmp expected .ipfs/api + printf "$ADDR_API" >expected && + test_cmp expected .ipfs/api ' test_expect_success "client should work (daemon on, /api file, no --api)" ' - test_client + test_client ' test_expect_success "client --api fromcfg should work (daemon used cfg) (daemon, /api file)" ' - test_client --api "$api_fromcfg" + test_client --api "$api_fromcfg" ' test_expect_success "client --api unreachable should err (daemon, /api file)" ' - test_client_must_fail --api "$api_unreachable" + test_client_must_fail --api "$api_unreachable" ' # then, test things without daemon, with /api file @@ -74,15 +74,15 @@ test_expect_success "client --api unreachable should err (daemon, /api file)" ' test_kill_ipfs_daemon test_expect_success "client should work (daemon off, /api file, no --api)" ' - test_client + test_client ' test_expect_success "client --api fromcfg should err (daemon off, /api file)" ' - test_client_must_fail --api "$api_fromcfg" + test_client_must_fail --api "$api_fromcfg" ' test_expect_success "client --api unreachable should err (daemon, /api file)" ' - test_client_must_fail --api "$api_unreachable" + test_client_must_fail --api "$api_unreachable" ' # then, test things with daemon --api $api_different, with /api file @@ -93,24 +93,24 @@ ADDR_API=$api_different test_launch_ipfs_daemon --api "$ADDR_API" test_expect_success "'ipfs daemon' --api option works" ' - printf "$api_different" >expected && - test_cmp expected .ipfs/api + printf "$api_different" >expected && + test_cmp expected .ipfs/api ' test_expect_success "client should work (daemon on, /api file (different), no --api)" ' - test_client + test_client ' test_expect_success "client --api different should work (daemon on, /api file (different))" ' - test_client --api "$api_different" + test_client --api "$api_different" ' test_expect_success "client --api fromcfg should err (daemon on, /api file (different))" ' - test_client_must_fail --api "$api_fromcfg" + test_client_must_fail --api "$api_fromcfg" ' test_expect_success "client --api unreachable should err (daemon, /api file)" ' - test_client_must_fail --api "$api_unreachable" + test_client_must_fail --api "$api_unreachable" ' # then, test things with daemon off, with /api file, for good measure. @@ -118,19 +118,19 @@ test_expect_success "client --api unreachable should err (daemon, /api file)" ' test_kill_ipfs_daemon test_expect_success "client should work (daemon off, /api file (different), no --api)" ' - test_client + test_client ' test_expect_success "client --api different should work (daemon on, /api file (different))" ' - test_client_must_fail --api "$api_different" + test_client_must_fail --api "$api_different" ' test_expect_success "client --api fromcfg should err (daemon on, /api file (different))" ' - test_client_must_fail --api "$api_fromcfg" + test_client_must_fail --api "$api_fromcfg" ' test_expect_success "client --api unreachable should err (daemon, /api file)" ' - test_client_must_fail --api "$api_unreachable" + test_client_must_fail --api "$api_unreachable" ' test_done