reprovider: Fix sharness tests
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Aug 3, 2017 at 10:23 UTC
7e5e0cba032682bfe413c56f0c0ad7b1c417b055
2 files changed
+13
-14
exchange/reprovide/reprovide_test.go
+2
-2
@@ -33,8 +33,8 @@ func TestReprovide(t *testing.T) {
33
bstore.Put(blk)
34
35
keyProvider := NewBlockstoreProvider(bstore)
36
- reprov := NewReprovider(clA, keyProvider)
37
- err := reprov.Reprovide(ctx)
36
+ reprov := NewReprovider(ctx, clA, keyProvider)
37
+ err := reprov.Reprovide()
38
if err != nil {
39
t.Fatal(err)
40
}
test/sharness/t0175-reprovider.sh
+11
-12
@@ -5,7 +5,7 @@ test_description="Test reprovider"
5
. lib/test-lib.sh
6
7
init_strategy() {
8
- NUM_NODES=2
8
+ NUM_NODES=6
9
test_expect_success 'init iptb' '
10
iptb init -f -n $NUM_NODES --bootstrap=none --port=0
11
'
@@ -19,30 +19,26 @@ init_strategy() {
19
ipfsi 0 config Reprovider.Strategy '$1'
20
'
21
22
- test_expect_success 'start peers' '
23
- iptb start 0 &&
24
- iptb start 1 &&
25
- iptb connect 0 1
26
- '
22
+ startup_cluster 6 --debug
23
}
24
25
findprovs_empty() {
30
- test_expect_success 'findprovs succeeds' '
26
+ test_expect_success 'findprovs '$1' succeeds' '
27
ipfsi 1 dht findprovs -n 1 '$1' > findprovsOut
28
'
29
34
- test_expect_success "findprovs output is empty" '
30
+ test_expect_success "findprovs $1 output is empty" '
31
test_must_be_empty findprovsOut
32
'
33
}
34
35
findprovs_expect() {
40
- test_expect_success 'findprovs succeeds' '
36
+ test_expect_success 'findprovs '$1' succeeds' '
37
ipfsi 1 dht findprovs -n 1 '$1' > findprovsOut &&
38
echo '$2' > expected
39
'
40
45
- test_expect_success "findprovs output looks good" '
41
+ test_expect_success "findprovs $1 output looks good" '
42
test_cmp findprovsOut expected
43
'
44
}
@@ -102,13 +98,15 @@ init_strategy 'roots'
98
99
test_expect_success 'prepare test files' '
100
echo foo > f1 &&
105
- echo bar > f2
101
+ echo bar > f2 &&
102
+ echo baz > f3
103
'
104
105
test_expect_success 'add test objects' '
106
HASH_FOO=$(ipfsi 0 add -q --local --pin=false f1) &&
107
HASH_BAR=$(ipfsi 0 add -q --local --pin=false f2) &&
111
- HASH_BAR_DIR=$(ipfsi 0 add -q --local -w f2)
108
+ HASH_BAZ=$(ipfsi 0 add -q --local f3) &&
109
+ HASH_BAR_DIR=$(ipfsi 0 add -q --local -w f2 | tail -1)
110
'
111
112
findprovs_empty '$HASH_FOO'
@@ -119,6 +117,7 @@ reprovide
117
118
findprovs_empty '$HASH_FOO'
119
findprovs_empty '$HASH_BAR'
120
+findprovs_expect '$HASH_BAZ' '$PEERID_0'
121
findprovs_expect '$HASH_BAR_DIR' '$PEERID_0'
122
123
test_expect_success 'stop peer 1' '