ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-18 20:57:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tests broken by new Rhizome store directory

Browse Source 
The recent faa0f39 did not update these tests that look in the "blob"
subdirectory.
This commit is contained in:
Andrew Bettison 2018-04-23 13:26:11 +09:30
parent 199dc55b27
commit f2e8198dba
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/rhizomerestful
View File

@ -1098,12 +1098,12 @@ setup_RhizomeJournalAppendSharedPayload() {
executeOk_servald rhizome add file '' file1
extract_stdout_filehash HASH1
get_external_blob_path blob_path1 "$HASH1"
assert cmp file1 "$blob_path1"
assert --stderr cmp file1 "$blob_path1"
executeOk_servald rhizome add file '' file12
extract_stdout_filehash HASH12
get_external_blob_path blob_path12 "$HASH12"
assert cmp file12 "$blob_path12"
assert [ $(find "$SERVALINSTANCE_PATH/blob" -type f | wc -l) -eq 2 ]
assert --stderr cmp file12 "$blob_path12"
assert --stderr [ $(find "$SERVALINSTANCE_PATH/rhizome/blob" -type f | wc -l) -eq 2 ]
}
test_RhizomeJournalAppendSharedPayload() {
rest_request POST "/restful/rhizome/append" 201 \
@ -1117,7 +1117,7 @@ test_RhizomeJournalAppendSharedPayload() {
assertGrep --matches=1 --ignore-case response.headers "^Serval-Rhizome-Result-Payload-Status-Code: 2$CR\$"
assertGrep --matches=1 --ignore-case response.headers "^Serval-Rhizome-Result-Payload-Status-Message: .*payload already in store.*$CR\$"
assertGrep --matches=1 --ignore-case response.headers "^Serval-Rhizome-Result-Payload-Status-Message: .*payload already in store.*$CR\$"
assert [ $(find "$SERVALINSTANCE_PATH/blob" -type f | wc -l) -eq 2 ]
assert [ $(find "$SERVALINSTANCE_PATH/rhizome/blob" -type f | wc -l) -eq 2 ]
extract_http_header BID response.headers Serval-Rhizome-Bundle-Id "$rexp_manifestid"
rest_request POST "/restful/rhizome/append" 201 \
--form-part="bundle-id=$BID;type=rhizome/bid;format=hex" \
@ -1129,7 +1129,7 @@ test_RhizomeJournalAppendSharedPayload() {
assertGrep --matches=1 --ignore-case response.headers "^Serval-Rhizome-Result-Bundle-Status-Message: .*bundle new to store.*$CR\$"
assertGrep --matches=1 --ignore-case response.headers "^Serval-Rhizome-Result-Payload-Status-Code: 2$CR\$"
assertGrep --matches=1 --ignore-case response.headers "^Serval-Rhizome-Result-Payload-Status-Message: .*payload already in store.*$CR\$"
assert [ $(find "$SERVALINSTANCE_PATH/blob" -type f | wc -l) -eq 2 ]
assert [ $(find "$SERVALINSTANCE_PATH/rhizome/blob" -type f | wc -l) -eq 2 ]
}
doc_RhizomeAppendNonJournalForbidden="REST API Rhizome cannot append to non-journal"