ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-20 17:33:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix assert_stdout_add_file() Rhizome test function

Browse Source 
Correct 'author' and 'secret' fieldnames to '.author' and
'.secret'
This commit is contained in:
Andrew Bettison 2014-11-14 12:57:43 +10:30
parent 1cbc2a365b
commit c3fdb12991
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testdefs_rhizome.sh
View File

@ -143,12 +143,12 @@ assert_stdout_add_file() {
if [ "$re_crypt" = 1 ]; then
opt_filehash=false
fi
fieldnames='service|manifestid|author|secret|BK|filesize|filehash|name'
fieldnames='service|manifestid|.author|.secret|BK|filesize|filehash|name'
for arg; do
case "$arg" in
!+($fieldnames))
fieldname="${arg#!}"
eval opt_$fieldname=false
eval opt_${fieldname#.}=false
;;
+($fieldnames)=*)
value="${arg#*=}"
@ -177,7 +177,7 @@ assert_stdout_add_file() {
assert_stdout_import_bundle() {
# Output of "import bundle" is the same as "add file" but without the secret
# or author fields.
assert_stdout_add_file "$@" '!secret' '!author'
assert_stdout_add_file "$@" '!.secret' '!.author'
}
unpack_manifest_for_grep() {

26
tests/rhizomeops
View File

@ -68,9 +68,9 @@ setup_AddNoAuthorNoManifest() {
}
test_AddNoAuthorNoManifest() {
executeOk_servald rhizome add file '' file1
assert_stdout_add_file file1 !author !BK
assert_stdout_add_file file1 !.author !BK
executeOk_servald rhizome add file '' "$PWD/file2"
assert_stdout_add_file file2 !author !BK
assert_stdout_add_file file2 !.author !BK
}
doc_AddNoManifest="Add with no manifest file"
@ -98,7 +98,7 @@ setup_AddNoAuthor() {
test_AddNoAuthor() {
executeOk_servald rhizome add file '' file1 file1.manifest
assert_manifest_fields file1.manifest !BK
assert_stdout_add_file file1 !author !BK
assert_stdout_add_file file1 !.author !BK
}
doc_AddInvalidAuthor="Add with invalid author fails"
@ -124,7 +124,7 @@ test_AddNoAuthorEncrypted() {
executeOk_servald rhizome add file '' file1 file1.manifest
tfw_cat --stdout --stderr
assert_manifest_fields file1.manifest !BK
assert_stdout_add_file file1 !author !BK
assert_stdout_add_file file1 !.author !BK
extract_stdout_secret file1_secret
executeOk_servald rhizome extract file $re_manifestid file1x $file1_secret
tfw_cat --stdout --stderr
@ -980,7 +980,7 @@ setup_MeshMSAddMissingAuthor() {
}
test_MeshMSAddMissingAuthor() {
executeOk_servald rhizome add file '' file1 file1.manifest
assert_stdout_add_file file1 !author !BK
assert_stdout_add_file file1 !.author !BK
assert_manifest_complete file1.manifest
executeOk_servald rhizome list
assert_rhizome_list --fromhere=1 file1
@ -995,13 +995,13 @@ setup_ListFilter() {
echo "File3" > file3
echo "File4" > file4
executeOk_servald rhizome add file '' file1 file1.manifest
assert_stdout_add_file file1 !author !BK
assert_stdout_add_file file1 !.author !BK
executeOk_servald rhizome add file '' file2 file2.manifest
assert_stdout_add_file file2 !author !BK
assert_stdout_add_file file2 !.author !BK
executeOk_servald rhizome add file '' file3 file3.manifest
assert_stdout_add_file file3 !author !BK
assert_stdout_add_file file3 !.author !BK
executeOk_servald rhizome add file '' file4 file4.manifest
assert_stdout_add_file file4 !author !BK
assert_stdout_add_file file4 !.author !BK
}
test_ListFilter() {
executeOk_servald rhizome list file
@ -1025,16 +1025,16 @@ setup_MeshMSListFilter() {
echo "Message3" >file4
echo -e "service=MeshMS1\nsender=$SIDB2\nrecipient=$SIDB3" >file4.manifest
executeOk_servald rhizome add file '' file1 file1.manifest
assert_stdout_add_file file1 !author !BK
assert_stdout_add_file file1 !.author !BK
assert_manifest_complete file1.manifest
executeOk_servald rhizome add file '' file2 file2.manifest
assert_stdout_add_file file2 !author !BK
assert_stdout_add_file file2 !.author !BK
assert_manifest_complete file2.manifest
executeOk_servald rhizome add file '' file3 file3.manifest
assert_stdout_add_file file3 !author !BK
assert_stdout_add_file file3 !.author !BK
assert_manifest_complete file3.manifest
executeOk_servald rhizome add file '' file4 file4.manifest
assert_stdout_add_file file4 !author !BK
assert_stdout_add_file file4 !.author !BK
assert_manifest_complete file4.manifest
executeOk_servald rhizome list
assert_rhizome_list --fromhere=1 file1 file2 file3 file4