sharness: make t0180-p2p less racy
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Oct 16, 2017 at 23:19 UTC
0f935ef1368f50f2ec6a7375b2a38ae2e8190c39
1 file changed
+6
-4
test/sharness/t0180-p2p.sh
+6
-4
@@ -42,7 +42,7 @@ test_expect_success 'start p2p listener' '
42
test_expect_success 'Test server to client communications' '
43
ma-pipe-unidir --listen --pidFile=listener.pid send /ip4/127.0.0.1/tcp/10101 < test0.bin &
44
45
- go-sleep 500ms &&
45
+ test_wait_for_file 30 100ms listener.pid &&
46
kill -0 $(cat listener.pid) &&
47
48
ipfsi 1 p2p stream dial $PEERID_0 p2p-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
@@ -53,7 +53,7 @@ test_expect_success 'Test server to client communications' '
53
test_expect_success 'Test client to server communications' '
54
ma-pipe-unidir --listen --pidFile=listener.pid recv /ip4/127.0.0.1/tcp/10101 > server.out &
55
56
- go-sleep 500ms &&
56
+ test_wait_for_file 30 100ms listener.pid &&
57
kill -0 $(cat listener.pid) &&
58
59
ipfsi 1 p2p stream dial $PEERID_0 p2p-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
@@ -94,7 +94,8 @@ test_expect_success "Setup: Idle stream" '
94
ipfsi 1 p2p stream dial $PEERID_0 p2p-test /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
95
ma-pipe-unidir --pidFile=client.pid recv /ip4/127.0.0.1/tcp/10102 &
96
97
- go-sleep 500ms &&
97
+ test_wait_for_file 30 100ms listener.pid &&
98
+ test_wait_for_file 30 100ms client.pid &&
99
kill -0 $(cat listener.pid) && kill -0 $(cat client.pid)
100
'
101
@@ -127,7 +128,8 @@ test_expect_success "Setup: Idle stream(2)" '
128
ipfsi 1 p2p stream dial $PEERID_0 p2p-test2 /ip4/127.0.0.1/tcp/10102 2>&1 > dialer-stdouterr.log &&
129
ma-pipe-unidir --pidFile=client.pid recv /ip4/127.0.0.1/tcp/10102 &
130
130
- go-sleep 500ms &&
131
+ test_wait_for_file 30 100ms listener.pid &&
132
+ test_wait_for_file 30 100ms client.pid &&
133
kill -0 $(cat listener.pid) && kill -0 $(cat client.pid)
134
'
135