diff --git a/test/sharness/lib/test-lib.sh b/test/sharness/lib/test-lib.sh index 4741d2c7f..78c358b14 100644 --- a/test/sharness/lib/test-lib.sh +++ b/test/sharness/lib/test-lib.sh @@ -193,7 +193,7 @@ test_config_ipfs_gateway_writable() { test_launch_ipfs_daemon() { - args=$1 + args="$@" test_expect_success "'ipfs daemon' succeeds" ' ipfs daemon $args >actual_daemon 2>daemon_err & diff --git a/test/sharness/t0061-daemon-opts.sh b/test/sharness/t0061-daemon-opts.sh index 549fa3e8f..f2f965fed 100755 --- a/test/sharness/t0061-daemon-opts.sh +++ b/test/sharness/t0061-daemon-opts.sh @@ -11,7 +11,7 @@ test_description="Test daemon command" test_init_ipfs -test_launch_ipfs_daemon '--unrestricted-api --disable-transport-encryption' +test_launch_ipfs_daemon --unrestricted-api --disable-transport-encryption gwyport=$PORT_GWAY apiport=$PORT_API diff --git a/test/sharness/t0062-daemon-api.sh b/test/sharness/t0062-daemon-api.sh index 25485ef90..1d604f5f9 100755 --- a/test/sharness/t0062-daemon-api.sh +++ b/test/sharness/t0062-daemon-api.sh @@ -39,20 +39,7 @@ test_expect_success "client should err if client api != api file while daemon is PORT_API=$differentport ADDR_API=$differentapi -# test_launch_ipfs_daemon '--api "$ADDR_API"' - -#pasted from test_launch_ipfs_daemon because the above line doesn't work -test_expect_success "'ipfs daemon' succeeds" ' - ipfs daemon --api $ADDR_API >actual_daemon 2>daemon_err & -' - -# we say the daemon is ready when the API server is ready. -test_expect_success "'ipfs daemon' is ready" ' - IPFS_PID=$! && - pollEndpoint -ep=/version -host=$ADDR_API -v -tout=1s -tries=60 2>poll_apierr > poll_apiout || - test_fsh cat actual_daemon || test_fsh cat daemon_err || test_fsh cat poll_apierr || test_fsh cat poll_apiout -' -#end of "test_launch_ipfs_daemon +test_launch_ipfs_daemon --api "$ADDR_API" test_expect_success "'ipfs daemon' api option works" ' printf "$differentapi" > expected &&