clean up test, run checks on all nodes
License: MIT Signed-off-by: Jeromy <why@ipfs.io>
Jeromy committed
Sep 29, 2016 at 18:05 UTC
2871decd48f0c5769cc6dbcb71803c614bd273a2
1 file changed
+12
-37
test/sharness/t0131-multinode-client-routing.sh
+12
-37
@@ -22,21 +22,17 @@ check_file_fetch() {
22
'
23
}
24
25
-check_dir_fetch() {
26
- node=$1
27
- ref=$2
28
-
29
- test_expect_success "node can fetch all refs for dir" '
30
- ipfsi $node refs -r $ref > /dev/null
31
- '
32
-}
33
-
25
run_single_file_test() {
26
test_expect_success "add a file on node1" '
27
random 1000000 > filea &&
28
FILEA_HASH=$(ipfsi 1 add -q filea)
29
'
30
31
+ check_file_fetch 9 $FILEA_HASH filea
32
+ check_file_fetch 8 $FILEA_HASH filea
33
+ check_file_fetch 7 $FILEA_HASH filea
34
+ check_file_fetch 6 $FILEA_HASH filea
35
+ check_file_fetch 5 $FILEA_HASH filea
36
check_file_fetch 4 $FILEA_HASH filea
37
check_file_fetch 3 $FILEA_HASH filea
38
check_file_fetch 2 $FILEA_HASH filea
@@ -44,35 +40,10 @@ run_single_file_test() {
40
check_file_fetch 0 $FILEA_HASH filea
41
}
42
47
-run_random_dir_test() {
48
- test_expect_success "create a bunch of random files" '
49
- random-files -depth=4 -dirs=5 -files=8 foobar > /dev/null
50
- '
51
-
52
- test_expect_success "add those on node 2" '
53
- DIR_HASH=$(ipfsi 2 add -r -q foobar | tail -n1)
54
- '
55
-
56
- check_dir_fetch 0 $DIR_HASH
57
- check_dir_fetch 1 $DIR_HASH
58
- check_dir_fetch 2 $DIR_HASH
59
- check_dir_fetch 3 $DIR_HASH
60
- check_dir_fetch 4 $DIR_HASH
61
-}
62
-
63
-run_advanced_test() {
64
-
65
- run_single_file_test
66
-
67
- run_random_dir_test
68
-
69
- test_expect_success "shut down nodes" '
70
- iptb stop
71
- '
72
-}
43
+NNODES=10
44
45
test_expect_success "set up testbed" '
75
- iptb init -n 10 -p 0 -f --bootstrap=none
46
+ iptb init -n $NNODES -p 0 -f --bootstrap=none
47
'
48
49
test_expect_success "start up nodes" '
@@ -93,6 +64,10 @@ test_expect_success "retrieve that file on a client mode node" '
64
check_file_fetch 9 $FILE_HASH filea
65
'
66
96
-run_advanced_test
67
+run_single_file_test
68
+
69
+test_expect_success "shut down nodes" '
70
+ iptb stop
71
+'
72
73
test_done