add: fix sharness tests (WIP)
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Mar 11, 2019 at 15:05 UTC
782b2d68ea472d33ac218b74ddadb50dc26799b8
2 files changed
+11
-14
test/sharness/t0080-repo.sh
+3
-6
@@ -30,8 +30,7 @@ test_expect_success "'ipfs repo gc' succeeds" '
30
'
31
32
test_expect_success "'ipfs repo gc' looks good (patch root)" '
33
- PATCH_ROOT=QmQXirSbubiySKnqaFyfs5YzziXRB5JEVQVjU6xsd7innr &&
34
- grep "removed $PATCH_ROOT" gc_out_actual
33
+ grep -v "removed $HASH" gc_out_actual
34
'
35
36
test_expect_success "'ipfs repo gc' doesnt remove file" '
@@ -113,8 +112,7 @@ test_expect_success "remove direct pin" '
112
113
test_expect_success "'ipfs repo gc' removes file" '
114
ipfs repo gc >actual7 &&
116
- grep "removed $HASH" actual7 &&
117
- grep "removed $PATCH_ROOT" actual7
115
+ grep "removed $HASH" actual7
116
'
117
118
test_expect_success "'ipfs refs local' no longer shows file" '
@@ -123,8 +121,7 @@ test_expect_success "'ipfs refs local' no longer shows file" '
121
grep "QmYCvbfNbCwFR45HiNP45rwJgvatpiW38D961L5qAhUM5Y" actual8 &&
122
grep "$EMPTY_DIR" actual8 &&
123
grep "$HASH_WELCOME_DOCS" actual8 &&
126
- test_must_fail grep "$HASH" actual8 &&
127
- test_must_fail grep "$PATCH_ROOT" actual8
124
+ test_must_fail grep "$HASH" actual8
125
'
126
127
test_expect_success "adding multiblock random file succeeds" '
test/sharness/t0175-reprovider.sh
+8
-8
@@ -75,9 +75,9 @@ test_expect_success 'prepare test files' '
75
'
76
77
test_expect_success 'add test objects' '
78
- HASH_FOO=$(ipfsi 0 add -q --local --pin=false f1) &&
79
- HASH_BAR=$(ipfsi 0 add -q --local --pin=false f2) &&
80
- HASH_BAR_DIR=$(ipfsi 0 add -q --local -w f2)
78
+ HASH_FOO=$(ipfsi 0 add -q --offline --pin=false f1) &&
79
+ HASH_BAR=$(ipfsi 0 add -q --offline --pin=false f2) &&
80
+ HASH_BAR_DIR=$(ipfsi 0 add -q --offline -w f2)
81
'
82
83
findprovs_empty '$HASH_FOO'
@@ -104,10 +104,10 @@ test_expect_success 'prepare test files' '
104
'
105
106
test_expect_success 'add test objects' '
107
- HASH_FOO=$(ipfsi 0 add -q --local --pin=false f1) &&
108
- HASH_BAR=$(ipfsi 0 add -q --local --pin=false f2) &&
109
- HASH_BAZ=$(ipfsi 0 add -q --local f3) &&
110
- HASH_BAR_DIR=$(ipfsi 0 add -q --local -w f2 | tail -1)
107
+ HASH_FOO=$(ipfsi 0 add -q --offline --pin=false f1) &&
108
+ HASH_BAR=$(ipfsi 0 add -q --offline --pin=false f2) &&
109
+ HASH_BAZ=$(ipfsi 0 add -q --offline f3) &&
110
+ HASH_BAR_DIR=$(ipfsi 0 add -q --offline -w f2 | tail -1)
111
'
112
113
findprovs_empty '$HASH_FOO'
@@ -142,7 +142,7 @@ test_expect_success 'Disable reprovider ticking' '
142
startup_cluster ${NUM_NODES}
143
144
test_expect_success 'add test object' '
145
- HASH_0=$(echo "foo" | ipfsi 0 add -q --local)
145
+ HASH_0=$(echo "foo" | ipfsi 0 add -q --offline)
146
'
147
148
findprovs_empty '$HASH_0'