test(sharness): fix tests for /ipfs -> /p2p change
Steven Allen committed
Dec 14, 2019 at 19:39 UTC
ff8e4fc89fe8d43ac91fc7682a5c009e118047bb
8 files changed
+40
-40
test/3nodetest/client/run.sh
+1
-1
@@ -1,4 +1,4 @@
1
-ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/ipfs/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
1
+ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/p2p/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
2
ipfs bootstrap # list bootstrap nodes for debugging
3
4
echo "3nodetest> starting client daemon"
test/3nodetest/server/run.sh
+2
-2
@@ -1,5 +1,5 @@
1
# must be connected to bootstrap node
2
-ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/ipfs/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
2
+ipfs bootstrap add /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/p2p/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
3
ipfs bootstrap # list bootstrap nodes for debugging
4
5
# wait for daemon to start/bootstrap
@@ -9,7 +9,7 @@ echo "3nodetest> starting server daemon"
9
# run daemon in debug mode to collect profiling data
10
ipfs daemon --debug &
11
sleep 3
12
-# TODO instead of bootrapping: ipfs swarm connect /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/ipfs/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
12
+# TODO instead of bootrapping: ipfs swarm connect /ip4/$BOOTSTRAP_PORT_4011_TCP_ADDR/tcp/$BOOTSTRAP_PORT_4011_TCP_PORT/p2p/QmNXuBh8HFsWq68Fid8dMbGNQTh7eG6hV9rr1fQyfmfomE
13
14
# change dir before running add commands so ipfs client profiling data doesn't
15
# overwrite the daemon profiling data
test/sharness/lib/iptb-lib.sh
+1
-1
@@ -14,7 +14,7 @@ ipfsi() {
14
check_has_connection() {
15
node="$1"
16
ipfsi "$node" swarm peers >"swarm_peers_$node" &&
17
- grep "ipfs" "swarm_peers_$node" >/dev/null
17
+ grep "p2p" "swarm_peers_$node" >/dev/null
18
}
19
20
iptb() {
test/sharness/t0120-bootstrap.sh
+13
-13
@@ -5,19 +5,19 @@
5
#
6
7
# changing the bootstrap peers will require changing it in two places :)
8
-BP1="/dnsaddr/bootstrap.libp2p.io/ipfs/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN"
9
-BP2="/dnsaddr/bootstrap.libp2p.io/ipfs/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa"
10
-BP3="/dnsaddr/bootstrap.libp2p.io/ipfs/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb"
11
-BP4="/dnsaddr/bootstrap.libp2p.io/ipfs/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt"
12
-BP5="/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ"
13
-BP6="/ip4/104.236.179.241/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM"
14
-BP7="/ip4/104.236.76.40/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64"
15
-BP8="/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu"
16
-BP9="/ip4/178.62.158.247/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd"
17
-BP10="/ip6/2400:6180:0:d0::151:6001/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu"
18
-BP11="/ip6/2604:a880:1:20::203:d001/tcp/4001/ipfs/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM"
19
-BP12="/ip6/2604:a880:800:10::4a:5001/tcp/4001/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64"
20
-BP13="/ip6/2a03:b0c0:0:1010::23:1001/tcp/4001/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd"
8
+BP1="/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN"
9
+BP2="/dnsaddr/bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa"
10
+BP3="/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb"
11
+BP4="/dnsaddr/bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt"
12
+BP5="/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ"
13
+BP6="/ip4/104.236.179.241/tcp/4001/p2p/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM"
14
+BP7="/ip4/104.236.76.40/tcp/4001/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64"
15
+BP8="/ip4/128.199.219.111/tcp/4001/p2p/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu"
16
+BP9="/ip4/178.62.158.247/tcp/4001/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd"
17
+BP10="/ip6/2400:6180:0:d0::151:6001/tcp/4001/p2p/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu"
18
+BP11="/ip6/2604:a880:1:20::203:d001/tcp/4001/p2p/QmSoLPppuBtQSGwKDZT2M73ULpjvfd3aZ6ha4oFGL1KrGM"
19
+BP12="/ip6/2604:a880:800:10::4a:5001/tcp/4001/p2p/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64"
20
+BP13="/ip6/2a03:b0c0:0:1010::23:1001/tcp/4001/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd"
21
22
test_description="Test ipfs repo operations"
23
test/sharness/t0121-bootstrap-iptb.sh
+1
-1
@@ -58,7 +58,7 @@ test_expect_success "reset iptb nodes" '
58
59
test_expect_success "set bootstrap addrs" '
60
bsn_peer_id=$(ipfs id -f "<id>") &&
61
- BADDR="/ip4/127.0.0.1/tcp/$SWARM_PORT/ipfs/$bsn_peer_id" &&
61
+ BADDR="/ip4/127.0.0.1/tcp/$SWARM_PORT/p2p/$bsn_peer_id" &&
62
ipfsi 0 bootstrap add $BADDR &&
63
ipfsi 1 bootstrap add $BADDR &&
64
ipfsi 2 bootstrap add $BADDR &&
test/sharness/t0140-swarm.sh
+3
-3
@@ -38,7 +38,7 @@ test_expect_success "output looks good" '
38
grep PublicKey output
39
'
40
41
-addr="/ip4/127.0.0.1/tcp/9898/ipfs/QmUWKoHbjsqsSMesRC2Zoscs8edyFz6F77auBB1YBBhgpX"
41
+addr="/ip4/127.0.0.1/tcp/9898/p2p/QmUWKoHbjsqsSMesRC2Zoscs8edyFz6F77auBB1YBBhgpX"
42
43
test_expect_success "cant trigger a dial backoff with swarm connect" '
44
test_expect_code 1 ipfs swarm connect $addr 2> connect_out
@@ -105,13 +105,13 @@ startup_cluster 2
105
106
test_expect_success "disconnect work without specifying a transport address" '
107
[ $(ipfsi 0 swarm peers | wc -l) -eq 1 ] &&
108
- ipfsi 0 swarm disconnect "/ipfs/$(iptb attr get 1 id)" &&
108
+ ipfsi 0 swarm disconnect "/p2p/$(iptb attr get 1 id)" &&
109
[ $(ipfsi 0 swarm peers | wc -l) -eq 0 ]
110
'
111
112
test_expect_success "connect work without specifying a transport address" '
113
[ $(ipfsi 0 swarm peers | wc -l) -eq 0 ] &&
114
- ipfsi 0 swarm connect "/ipfs/$(iptb attr get 1 id)" &&
114
+ ipfsi 0 swarm connect "/p2p/$(iptb attr get 1 id)" &&
115
[ $(ipfsi 0 swarm peers | wc -l) -eq 1 ]
116
'
117
test/sharness/t0180-p2p.sh
+16
-16
@@ -75,12 +75,12 @@ test_server_to_client() {
75
76
spawn_sending_server
77
78
-test_expect_success 'S->C(/ipfs/peerID) Setup client side' '
79
- ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /ipfs/${PEERID_0} 2>&1 > dialer-stdouterr.log
78
+test_expect_success 'S->C(/p2p/peerID) Setup client side' '
79
+ ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /p2p/${PEERID_0} 2>&1 > dialer-stdouterr.log
80
'
81
82
-test_expect_success 'S->C Setup(dnsaddr/addr/ipfs/peerID) client side' '
83
- ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10103 /dnsaddr/bootstrap.libp2p.io/ipfs/${PEERID_0} 2>&1 > dialer-stdouterr.log
82
+test_expect_success 'S->C Setup(dnsaddr/addr/p2p/peerID) client side' '
83
+ ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10103 /dnsaddr/bootstrap.libp2p.io/p2p/${PEERID_0} 2>&1 > dialer-stdouterr.log
84
'
85
86
test_expect_success 'S->C Setup(dnsaddr/addr) client side' '
@@ -126,7 +126,7 @@ test_expect_success 'C->S Spawn receiving server' '
126
'
127
128
test_expect_success 'C->S Setup client side' '
129
- ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /ipfs/${PEERID_0} 2>&1 > dialer-stdouterr.log
129
+ ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /p2p/${PEERID_0} 2>&1 > dialer-stdouterr.log
130
'
131
132
test_expect_success 'C->S Connect and receive data' '
@@ -155,7 +155,7 @@ test_expect_success "cannot accept 0 port in 'ipfs p2p listen'" '
155
'
156
157
test_expect_success "'ipfs p2p forward' accept 0 port" '
158
- ipfsi 2 p2p forward /x/p2p-test/0 /ip4/127.0.0.1/tcp/0 /ipfs/$PEERID_0
158
+ ipfsi 2 p2p forward /x/p2p-test/0 /ip4/127.0.0.1/tcp/0 /p2p/$PEERID_0
159
'
160
161
test_expect_success "'ipfs p2p ls' output looks good" '
@@ -168,7 +168,7 @@ test_expect_success "'ipfs p2p ls' output looks good" '
168
# Listing streams
169
170
test_expect_success "'ipfs p2p ls' succeeds" '
171
- echo "/x/p2p-test /ipfs/$PEERID_0 /ip4/127.0.0.1/tcp/10101" > expected &&
171
+ echo "/x/p2p-test /p2p/$PEERID_0 /ip4/127.0.0.1/tcp/10101" > expected &&
172
ipfsi 0 p2p ls > actual
173
'
174
@@ -190,7 +190,7 @@ check_test_ports
190
test_expect_success "Setup: Idle stream" '
191
ma-pipe-unidir --listen --pidFile=listener.pid recv /ip4/127.0.0.1/tcp/10101 &
192
193
- ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /ipfs/$PEERID_0 &&
193
+ ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /p2p/$PEERID_0 &&
194
ma-pipe-unidir --pidFile=client.pid recv /ip4/127.0.0.1/tcp/10102 &
195
196
test_wait_for_file 30 100ms listener.pid &&
@@ -199,7 +199,7 @@ test_expect_success "Setup: Idle stream" '
199
'
200
201
test_expect_success "'ipfs p2p stream ls' succeeds" '
202
- echo "3 /x/p2p-test /ipfs/$PEERID_1 /ip4/127.0.0.1/tcp/10101" > expected
202
+ echo "3 /x/p2p-test /p2p/$PEERID_1 /ip4/127.0.0.1/tcp/10101" > expected
203
ipfsi 0 p2p stream ls > actual
204
'
205
@@ -232,7 +232,7 @@ test_expect_success "Setup: Idle stream(2)" '
232
ma-pipe-unidir --listen --pidFile=listener.pid recv /ip4/127.0.0.1/tcp/10101 &
233
234
ipfsi 0 p2p listen /x/p2p-test2 /ip4/127.0.0.1/tcp/10101 2>&1 > listener-stdouterr.log &&
235
- ipfsi 1 p2p forward /x/p2p-test2 /ip4/127.0.0.1/tcp/10102 /ipfs/$PEERID_0 2>&1 > dialer-stdouterr.log &&
235
+ ipfsi 1 p2p forward /x/p2p-test2 /ip4/127.0.0.1/tcp/10102 /p2p/$PEERID_0 2>&1 > dialer-stdouterr.log &&
236
ma-pipe-unidir --pidFile=client.pid recv /ip4/127.0.0.1/tcp/10102 &
237
238
test_wait_for_file 30 100ms listener.pid &&
@@ -241,7 +241,7 @@ test_expect_success "Setup: Idle stream(2)" '
241
'
242
243
test_expect_success "'ipfs p2p stream ls' succeeds(2)" '
244
- echo "4 /x/p2p-test2 /ipfs/$PEERID_1 /ip4/127.0.0.1/tcp/10101" > expected
244
+ echo "4 /x/p2p-test2 /p2p/$PEERID_1 /ip4/127.0.0.1/tcp/10101" > expected
245
ipfsi 0 p2p stream ls > actual
246
test_cmp expected actual
247
'
@@ -283,8 +283,8 @@ test_expect_success "'ipfs p2p close' closes by target addr" '
283
284
test_expect_success "'ipfs p2p close' closes right listeners" '
285
ipfsi 0 p2p listen /x/p2p-test /ip4/127.0.0.1/tcp/10101 &&
286
- ipfsi 0 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10101 /ipfs/$PEERID_1 &&
287
- echo "/x/p2p-test /ipfs/$PEERID_0 /ip4/127.0.0.1/tcp/10101" > expected &&
286
+ ipfsi 0 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10101 /p2p/$PEERID_1 &&
287
+ echo "/x/p2p-test /p2p/$PEERID_0 /ip4/127.0.0.1/tcp/10101" > expected &&
288
289
ipfsi 0 p2p close -l /ip4/127.0.0.1/tcp/10101 &&
290
ipfsi 0 p2p ls > actual &&
@@ -294,7 +294,7 @@ test_expect_success "'ipfs p2p close' closes right listeners" '
294
check_test_ports
295
296
test_expect_success "'ipfs p2p close' closes by listen addr" '
297
- ipfsi 0 p2p close -l /ipfs/$PEERID_0 &&
297
+ ipfsi 0 p2p close -l /p2p/$PEERID_0 &&
298
ipfsi 0 p2p ls > actual &&
299
test_must_be_empty actual
300
'
@@ -313,7 +313,7 @@ test_expect_success 'C->S Spawn receiving server' '
313
'
314
315
test_expect_success 'C->S Setup client side' '
316
- ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /ipfs/${PEERID_0} 2>&1 > dialer-stdouterr.log
316
+ ipfsi 1 p2p forward /x/p2p-test /ip4/127.0.0.1/tcp/10102 /p2p/${PEERID_0} 2>&1 > dialer-stdouterr.log
317
'
318
319
test_expect_success 'C->S Connect and receive data' '
@@ -358,7 +358,7 @@ test_expect_success 'start p2p listener on custom proto' '
358
spawn_sending_server
359
360
test_expect_success 'S->C Setup client side (custom proto)' '
361
- ipfsi 1 p2p forward --allow-custom-protocol /p2p-test /ip4/127.0.0.1/tcp/10102 /ipfs/${PEERID_0} 2>&1 > dialer-stdouterr.log
361
+ ipfsi 1 p2p forward --allow-custom-protocol /p2p-test /ip4/127.0.0.1/tcp/10102 /p2p/${PEERID_0} 2>&1 > dialer-stdouterr.log
362
'
363
364
test_server_to_client
test/sharness/t0182-circuit-relay.sh
+3
-3
@@ -44,7 +44,7 @@ test_expect_success 'peer ids' '
44
'
45
46
test_expect_success 'connect A <-Relay-> B' '
47
- ipfsi 0 swarm connect /p2p-circuit/ipfs/$PEERID_2 > peers_out
47
+ ipfsi 0 swarm connect /p2p-circuit/p2p/$PEERID_2 > peers_out
48
'
49
50
test_expect_success 'output looks good' '
@@ -54,12 +54,12 @@ test_expect_success 'output looks good' '
54
55
test_expect_success 'peers for A look good' '
56
ipfsi 0 swarm peers > peers_out &&
57
- test_should_contain "/ipfs/$PEERID_1/p2p-circuit/ipfs/$PEERID_2$" peers_out
57
+ test_should_contain "/p2p/$PEERID_1/p2p-circuit/p2p/$PEERID_2$" peers_out
58
'
59
60
test_expect_success 'peers for B look good' '
61
ipfsi 2 swarm peers > peers_out &&
62
- test_should_contain "/ipfs/$PEERID_1/p2p-circuit/ipfs/$PEERID_0$" peers_out
62
+ test_should_contain "/p2p/$PEERID_1/p2p-circuit/p2p/$PEERID_0$" peers_out
63
'
64
65
test_expect_success 'add an object in A' '