X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=t%2Ft0004-server.sh;h=c2e809cb6da569d05177bd3552ece039047a96e7;hp=04d6cd609a33a9886130d31efff86f4af509ab6f;hb=33692c33f2effa9620064aec44c6196a8d830d05;hpb=f167629b3191c57a6b691cd2a6af04a45a74ccb0

diff --git a/t/t0004-server.sh b/t/t0004-server.sh
index 04d6cd60..c2e809cb 100755
--- a/t/t0004-server.sh
+++ b/t/t0004-server.sh
@@ -21,7 +21,8 @@ pubkey=$privkey.pub
 serverlog=server.log
 
 get_audio_file_paths ogg
-oggs="$result"
+declare -a oggs=($result)
+declare -a oggs_base=(${oggs[@]##*/})
 
 declare -a commands=() cmdline=() required_objects=() good=() bad=()
 i=0
@@ -38,14 +39,38 @@ bad[$i]='!^successfully'
 let i++
 commands[$i]="add_ogg"
 required_objects[$i]='ogg_afh'
-cmdline[$i]="add $oggs"
+cmdline[$i]="add ${oggs[@]}"
 bad[$i]='.'
 
 let i++
 commands[$i]="ls_ogg"
 required_objects[$i]='ogg_afh'
-cmdline[$i]="ls -lv -p $oggs"
-good[$i]='^path:'
+cmdline[$i]="ls -l=v ${oggs_base[@]}"
+good[$i]='^basename:'
+
+let i++
+commands[$i]='addatt'
+required_objects[$i]=''
+cmdline[$i]="addatt $(seq 64 | tr '\n' ' ')"
+bad[$i]='.'
+
+let i++
+commands[$i]='lsatt'
+required_objects[$i]=''
+cmdline[$i]="lsatt"
+good[$i]='^1$'
+
+let i++
+commands[$i]='setatt'
+required_objects[$i]='ogg_afh'
+cmdline[$i]="setatt 33+ ${oggs[@]}"
+bad[$i]='.'
+
+let i++
+commands[$i]="ls"
+required_objects[$i]='ogg_afh'
+cmdline[$i]="ls -l=v -p ${oggs[@]}"
+good[$i]='^attributes_txt: 33'
 
 let i++
 commands[$i]="term"
@@ -83,6 +108,7 @@ EOF
 		--user-list "$user_list" \
 		--http-port "$stream_port" \
 		--dccp-port "$stream_port"
+	(($? != 0)) && exit 1
 fi
 
 for ((i=0; i < ${#commands[@]}; i++)); do