ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-18 10:46:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Rhizome test case: import journal bundle

Browse Source 
Also fix a bug thus revealed
This commit is contained in:
Andrew Bettison 2015-03-02 12:14:43 +10:30
parent e2ef96a57d
commit e0684567e8
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rhizome_cli.c
View File

@ -407,6 +407,8 @@ static int app_rhizome_import_bundle(const struct cli_parsed *parsed, struct cli
enum rhizome_bundle_status status = rhizome_bundle_import_files(m, &m_out, manifestpath, filepath);
switch (status) {
case RHIZOME_BUNDLE_STATUS_NEW:
cli_put_manifest(context, m);
break;
case RHIZOME_BUNDLE_STATUS_SAME:
case RHIZOME_BUNDLE_STATUS_DUPLICATE:
case RHIZOME_BUNDLE_STATUS_OLD:

42
tests/rhizomeops
View File

@ -1295,6 +1295,48 @@ test_ImportCombinedBundle() {
assert diff fileA fileAx
}
doc_ImportJournal="Import a journal bundle"
setup_ImportJournal() {
setup_servald
setup_rhizome
echo "Part One" > file1
echo "Part Two2" > file2
cat file1 file2 >file3
set_instance +A
executeOk_servald rhizome journal append $SIDA1 "" file1
assert_stdout_add_file file1
extract_stdout_keyvalue BID 'manifestid' '[0-9A-F]\+'
executeOk_servald rhizome extract bundle $BID file1x.manifest file1x
assert diff file1 file1x
}
test_ImportJournal() {
# Import a journal bundle from a foreign instance.
set_instance +B
executeOk_servald rhizome import bundle file1x file1x.manifest
assert_stdout_import_bundle file1x
executeOk_servald rhizome list
assert_rhizome_list --fromhere=0 file1x
# Try to import the same journal bundle again, exit status 1 means bundle is
# already in store.
execute --exit-status=1 --stdout --stderr $servald rhizome import bundle file1x file1x.manifest
assert_stdout_import_bundle file1x
executeOk_servald rhizome list
assert_rhizome_list --fromhere=0 file1x
# Grow the journal and import it again.
begin_fixture
set_instance +A
executeOk_servald rhizome journal append $SIDA1 $BID file2
assert_stdout_add_file file3 manifestid=$BID name=file1
executeOk_servald rhizome extract bundle $BID file3x.manifest file3x
assert diff file3 file3x
end_fixture
set_instance +B
executeOk_servald rhizome import bundle file3x file3x.manifest
assert_stdout_import_bundle file3x
executeOk_servald rhizome list
assert_rhizome_list --fromhere=0 file3x
}
setup_delete() {
setup_servald
setup_rhizome