sharness/t0060-daemon: don't reuse expect/actual names
Henry committed
May 28, 2015 at 18:01 UTC
dba455a59d4ee30f851920a893d975dca7d270b5
1 file changed
+13
-12
test/sharness/t0060-daemon.sh
+13
-12
@@ -14,6 +14,7 @@ test_expect_success "setup IPFS_PATH" '
14
'
15
16
# NOTE: this should remove bootstrap peers (needs a flag)
17
+# TODO(cryptix): also default ports - might clash with local clients, failure in that case isn't clear because pollEndpoint just passes too
18
test_expect_success "ipfs daemon --init launches" '
19
ipfs daemon --init >actual_daemon 2>daemon_err &
20
'
@@ -28,9 +29,9 @@ test_expect_success "initialization ended" '
29
# this is lifted straight from t0020-init.sh
30
test_expect_success "ipfs peer id looks good" '
31
PEERID=$(ipfs config Identity.PeerID) &&
31
- echo $PEERID | tr -dC "[:alnum:]" | wc -c | tr -d " " >actual &&
32
- echo "46" >expected &&
33
- test_cmp_repeat_10_sec expected actual
32
+ echo $PEERID | tr -dC "[:alnum:]" | wc -c | tr -d " " >actual_id &&
33
+ echo "46" >expected_id &&
34
+ test_cmp_repeat_10_sec expected_id actual_id
35
'
36
37
# This is like t0020-init.sh "ipfs init output looks good"
@@ -43,15 +44,15 @@ test_expect_success "ipfs peer id looks good" '
44
#
45
test_expect_failure "ipfs daemon output looks good" '
46
STARTFILE="ipfs cat /ipfs/$HASH_WELCOME_DOCS/readme" &&
46
- echo "Initializing daemon..." >expected &&
47
- echo "initializing ipfs node at $IPFS_PATH" >>expected &&
48
- echo "generating 4096-bit RSA keypair...done" >>expected &&
49
- echo "peer identity: $PEERID" >>expected &&
50
- echo "to get started, enter:" >>expected &&
51
- printf "\\n\\t$STARTFILE\\n\\n" >>expected &&
52
- echo "API server listening on /ip4/127.0.0.1/tcp/5001" >>expected &&
53
- echo "Gateway (readonly) server listening on /ip4/127.0.0.1/tcp/8080" >>expected &&
54
- test_cmp_repeat_10_sec expected actual_daemon
47
+ echo "Initializing daemon..." >expected_daemon &&
48
+ echo "initializing ipfs node at $IPFS_PATH" >>expected_daemon &&
49
+ echo "generating 2048-bit RSA keypair...done" >>expected_daemon &&
50
+ echo "peer identity: $PEERID" >>expected_daemon &&
51
+ echo "to get started, enter:" >>expected_daemon &&
52
+ printf "\\n\\t$STARTFILE\\n\\n" >>expected_daemon &&
53
+ echo "API server listening on /ip4/127.0.0.1/tcp/5001" >>expected_daemon &&
54
+ echo "Gateway (readonly) server listening on /ip4/127.0.0.1/tcp/8080" >>expected_daemon &&
55
+ test_cmp_repeat_10_sec expected_daemon actual_daemon
56
'
57
58
test_expect_success ".ipfs/ has been created" '