Improve 'rhizomeops' test fixtures

Use extract_stdout_manifestid() instead of extract_stdout_keyvalue()
This commit is contained in:
Andrew Bettison 2015-03-28 04:57:12 +10:30
parent dbea301ce2
commit b17848a438

View File

@ -1011,7 +1011,7 @@ test_JournalAppend() {
executeOk_servald rhizome journal append $SIDA "" file1
tfw_cat --stdout --stderr
assert_stdout_add_file file1
extract_stdout_keyvalue BID 'manifestid' '[0-9A-F]\+'
extract_stdout_manifestid BID
executeOk_servald rhizome journal append $SIDA $BID file2
tfw_cat --stdout --stderr
executeOk_servald rhizome extract file $BID filex
@ -1040,7 +1040,7 @@ setup_JournalAddUpdate() {
echo "Part One" > file1
executeOk_servald rhizome journal append $SIDA "" file1
assert_stdout_add_file file1
extract_stdout_keyvalue BID 'manifestid' '[0-9A-F]\+'
extract_stdout_manifestid BID
executeOk_servald rhizome extract bundle $BID file1x.manifest file1x
assert diff file1 file1x
extract_manifest_version version file1x.manifest
@ -1064,7 +1064,7 @@ setup_AppendFile() {
executeOk_servald rhizome add file $SIDA file1
tfw_cat --stdout --stderr
assert_stdout_add_file file1
extract_stdout_keyvalue BID 'manifestid' '[0-9A-F]\+'
extract_stdout_manifestid BID
}
test_AppendFile() {
# TODO: servald should return a status code reserved for this case, instead
@ -1376,7 +1376,7 @@ setup_ImportJournal() {
cat file1 file2 >file3
executeOk_servald rhizome journal append $SIDA "" file1
assert_stdout_add_file file1
extract_stdout_keyvalue BID 'manifestid' '[0-9A-F]\+'
extract_stdout_manifestid BID
executeOk_servald rhizome extract bundle $BID file1x.manifest file1x
assert diff file1 file1x
}