Updates uses of *_ADDR -> *_MADDR
License: MIT Signed-off-by: Stephen Whitmore <noffle@ipfs.io>
Stephen Whitmore committed
Feb 19, 2016 at 20:05 UTC
c342d57347188f3ebec5c2be6b840cb0e80eaf90
1 file changed
+7
-7
test/sharness/t0060-daemon.sh
+7
-7
@@ -12,8 +12,8 @@ gwyport=8082
12
apiport=5002
13
swarmport=4003
14
15
-API_ADDR="/ip4/0.0.0.0/tcp/$apiport"
16
-GATEWAY_ADDR="/ip4/0.0.0.0/tcp/$gwyport"
15
+API_MADDR="/ip4/0.0.0.0/tcp/$apiport"
16
+GATEWAY_MADDR="/ip4/0.0.0.0/tcp/$gwyport"
17
18
# TODO: randomize ports here once we add --config to ipfs daemon
19
@@ -25,8 +25,8 @@ test_expect_success "setup IPFS_PATH" '
25
26
test_expect_success 'ipfs init & config' '
27
ipfs init &&
28
- ipfs config Addresses.Gateway $GATEWAY_ADDR &&
29
- ipfs config Addresses.API $API_ADDR &&
28
+ ipfs config Addresses.Gateway $GATEWAY_MADDR &&
29
+ ipfs config Addresses.API $API_MADDR &&
30
ipfs config --json=true Addresses.Swarm "[\"/ip4/0.0.0.0/tcp/4003\"]"
31
'
32
@@ -59,8 +59,8 @@ test_expect_success "ipfs daemon output looks good" '
59
STARTFILE="ipfs cat /ipfs/$HASH_WELCOME_DOCS/readme" &&
60
echo "Initializing daemon..." >expected_daemon &&
61
sed "s/^/Swarm listening on /" local_addrs >>expected_daemon &&
62
- echo "API server listening on '$API_ADDR'" >>expected_daemon &&
63
- echo "Gateway (readonly) server listening on '$GATEWAY_ADDR'" >>expected_daemon &&
62
+ echo "API server listening on '$API_MADDR'" >>expected_daemon &&
63
+ echo "Gateway (readonly) server listening on '$GATEWAY_MADDR'" >>expected_daemon &&
64
echo "Daemon is ready" >>expected_daemon &&
65
test_cmp expected_daemon actual_daemon
66
'
@@ -130,7 +130,7 @@ test_expect_success "'ipfs daemon' can be killed" '
130
131
test_expect_success "'ipfs daemon' should be able to run with a pipe attached to stdin (issue #861)" '
132
yes | ipfs daemon --init >stdin_daemon_out 2>stdin_daemon_err &
133
- pollEndpoint -host='$API_ADDR' -ep=/version -v -tout=1s -tries=10 >stdin_poll_apiout 2>stdin_poll_apierr &&
133
+ pollEndpoint -host='$API_MADDR' -ep=/version -v -tout=1s -tries=10 >stdin_poll_apiout 2>stdin_poll_apierr &&
134
test_kill_repeat_10_sec $! ||
135
test_fsh cat stdin_daemon_out || test_fsh cat stdin_daemon_err || test_fsh cat stdin_poll_apiout || test_fsh cat stdin_poll_apierr
136
'