Do not mangle diagnostics when sorted comparison needed
Peter Rabbitson committed
Apr 14, 2020 at 06:52 UTC
8a32251e661ee90d3f2274bea6fa157239639918
1 file changed
+18
-11
test/sharness/t0054-dag-car-import-export.sh
+18
-11
@@ -11,6 +11,13 @@ set -o pipefail
11
tar -C ../t0054-dag-car-import-export-data/ --strip-components=1 -Jxf ../t0054-dag-car-import-export-data/test_dataset_car_v0.tar.xz
12
tab=$'\t'
13
14
+test_cmp_sorted() {
15
+ # use test_cmp to dump out the unsorted file contents as a diff
16
+ [[ "$( sort "$1" | sha256sum )" == "$( sort "$2" | sha256sum )" ]] \
17
+ || test_cmp "$1" "$2"
18
+}
19
+export -f test_cmp_sorted
20
+
21
reset_blockstore() {
22
node=$1
23
@@ -65,11 +72,11 @@ EOE
72
../t0054-dag-car-import-export-data/combined_naked_roots_genesis_and_128.car \
73
../t0054-dag-car-import-export-data/lotus_testnet_export_128_shuffled_nulroot.car \
74
../t0054-dag-car-import-export-data/lotus_devnet_genesis_shuffled_nulroot.car \
68
- | sort > basic_import_actual
75
+ > basic_import_actual
76
'
77
78
test_expect_success "basic import output as expected" '
72
- test_cmp basic_import_expected basic_import_actual
79
+ test_cmp_sorted basic_import_expected basic_import_actual
80
'
81
82
test_expect_success "basic fetch+export 1" '
@@ -92,11 +99,11 @@ EOE
99
100
test_expect_success "import/pin naked roots only, relying on local blockstore having all the data" '
101
ipfsi 1 dag import --enc=json ../t0054-dag-car-import-export-data/combined_naked_roots_genesis_and_128.car \
95
- | sort > naked_import_result_json_actual
102
+ > naked_import_result_json_actual
103
'
104
105
test_expect_success "naked import output as expected" '
99
- test_cmp naked_root_import_json_expected naked_import_result_json_actual
106
+ test_cmp_sorted naked_root_import_json_expected naked_import_result_json_actual
107
'
108
109
reset_blockstore 0
@@ -114,7 +121,7 @@ EOE
121
pipe_testnet \
122
pipe_devnet \
123
../t0054-dag-car-import-export-data/combined_naked_roots_genesis_and_128.car \
117
- | sort > basic_fifo_import_actual
124
+ > basic_fifo_import_actual
125
result=$?
126
127
wait
@@ -127,7 +134,7 @@ EOE
134
'
135
136
test_expect_success "fifo-import output as expected" '
130
- test_cmp basic_import_expected basic_fifo_import_actual
137
+ test_cmp_sorted basic_import_expected basic_fifo_import_actual
138
'
139
}
140
@@ -158,7 +165,7 @@ test_expect_success "basic offline export of nonexistent cid" '
165
! ipfs dag export QmYwAPJXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX 2> offline_fetch_error_actual >/dev/null
166
'
167
test_expect_success "correct error" '
161
- test_cmp offline_fetch_error_expected offline_fetch_error_actual
168
+ test_cmp_sorted offline_fetch_error_expected offline_fetch_error_actual
169
'
170
171
@@ -168,10 +175,10 @@ cat >multiroot_import_json_expected <<EOE
175
{"Root":{"Cid":{"/":"bafy2bzacede2hsme6hparlbr4g2x6pylj43olp4uihwjq3plqdjyrdhrv7cp4"},"PinErrorMsg":""}}
176
EOE
177
test_expect_success "multiroot import works" '
171
- ipfs dag import --enc=json ../t0054-dag-car-import-export-data/lotus_testnet_export_256_multiroot.car | sort > multiroot_import_json_actual
178
+ ipfs dag import --enc=json ../t0054-dag-car-import-export-data/lotus_testnet_export_256_multiroot.car > multiroot_import_json_actual
179
'
180
test_expect_success "multiroot import expected output" '
174
- test_cmp multiroot_import_json_expected multiroot_import_json_actual
181
+ test_cmp_sorted multiroot_import_json_expected multiroot_import_json_actual
182
'
183
184
@@ -188,10 +195,10 @@ test_expect_success "expected silence on --pin-roots=false" '
195
196
test_expect_success "naked root import works" '
197
ipfs dag import --enc=json ../t0054-dag-car-import-export-data/combined_naked_roots_genesis_and_128.car \
191
- | sort > naked_root_import_json_actual
198
+ > naked_root_import_json_actual
199
'
200
test_expect_success "naked root import expected output" '
194
- test_cmp naked_root_import_json_expected naked_root_import_json_actual
201
+ test_cmp_sorted naked_root_import_json_expected naked_root_import_json_actual
202
'
203
204
test_done