ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-21 22:17:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tests for new rhizome list column

Browse Source
This commit is contained in:
Jeremy Lakeman 2013-01-23 14:05:18 +10:30
parent 3a93fee8a5
commit 521c9471d4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testdefs_rhizome.sh
View File

@ -26,6 +26,7 @@ rexp_filesize='[0-9]\{1,\}'
rexp_version='[0-9]\{1,\}' rexp_version='[0-9]\{1,\}'
rexp_crypt='[0-9]\{1,\}' rexp_crypt='[0-9]\{1,\}'
rexp_date='[0-9]\{1,\}' rexp_date='[0-9]\{1,\}'
rexp_rowid='[0-9]\{1,\}'
assert_manifest_complete() { assert_manifest_complete() {
local manifest="$1" local manifest="$1"
@ -49,8 +50,8 @@ assert_manifest_complete() {
# Assertion function: # Assertion function:
# - assert that the output of a "servald rhizome list" command exactly describes the given files # - assert that the output of a "servald rhizome list" command exactly describes the given files
assert_rhizome_list() { assert_rhizome_list() {
assertStdoutIs --stderr --line=1 -e '12\n' assertStdoutIs --stderr --line=1 -e '13\n'
assertStdoutIs --stderr --line=2 -e 'service:id:version:date:.inserttime:.author:.fromhere:filesize:filehash:sender:recipient:name\n' assertStdoutIs --stderr --line=2 -e '_id:service:id:version:date:.inserttime:.author:.fromhere:filesize:filehash:sender:recipient:name\n'
local filename local filename
local exactly=true local exactly=true
local re__inserttime="$rexp_date" local re__inserttime="$rexp_date"
@ -65,7 +66,7 @@ assert_rhizome_list() {
--*) error "unsupported option: $filename";; --*) error "unsupported option: $filename";;
*) *)
unpack_manifest_for_grep "$filename" unpack_manifest_for_grep "$filename"
assertStdoutGrep --stderr --matches=1 "^$re_service:$re_manifestid:$re_version:$re_date:$re__inserttime:$re__author:$re__fromhere:$re_filesize:$re_filehash:$re_sender:$re_recipient:$re_name\$" assertStdoutGrep --stderr --matches=1 "^$rexp_rowid:$re_service:$re_manifestid:$re_version:$re_date:$re__inserttime:$re__author:$re__fromhere:$re_filesize:$re_filehash:$re_sender:$re_recipient:$re_name\$"
let files+=1 let files+=1
;; ;;
esac esac