X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=t%2Ft0004-server.sh;h=9e681107646e85e0fdcc3e12ec1ed13694376628;hp=3cb37d4260cf21fb3ec83109642642cf67bc1f52;hb=HEAD;hpb=4ad8a5536d7cea1e63137933b242c52e57bd53d6

diff --git a/t/t0004-server.sh b/t/t0004-server.sh
index 3cb37d42..f7a407dc 100755
--- a/t/t0004-server.sh
+++ b/t/t0004-server.sh
@@ -24,11 +24,12 @@ get_audio_file_paths ogg
 declare -a oggs=($result)
 declare -a oggs_base=(${oggs[@]##*/})
 
-declare -a commands=() cmdline=() required_objects=() good=() bad=()
+declare -a commands=() cmdline=() required_objects=() good=() bad=() \
+	expect_failure=()
 i=0
 commands[$i]="help"
-cmdline[$i]="help"
-good[$i]='help	server	----'
+cmdline[$i]="help -l"
+good[$i]='help \{1,\}----'
 
 let i++
 commands[$i]="init"
@@ -36,6 +37,18 @@ cmdline[$i]="init"
 good[$i]='^successfully'
 bad[$i]='!^successfully'
 
+let i++
+commands[$i]='add_dir'
+required_objects[$i]='ogg_afh'
+cmdline[$i]="add -v $test_audio_file_dir"
+good[$i]='^adding'
+
+let i++
+commands[$i]='rm'
+required_objects[$i]='ogg_afh'
+cmdline[$i]="rm -v $test_audio_file_dir/*"
+good[$i]='^removing'
+
 let i++
 commands[$i]="add_ogg"
 required_objects[$i]='ogg_afh'
@@ -45,7 +58,7 @@ bad[$i]='.'
 let i++
 commands[$i]="ls_ogg"
 required_objects[$i]='ogg_afh'
-cmdline[$i]="ls -l=v ${oggs_base[@]}"
+cmdline[$i]="ls -l=v -b ${oggs_base[@]}"
 good[$i]='^basename:'
 
 let i++
@@ -69,9 +82,18 @@ bad[$i]='.'
 let i++
 commands[$i]="ls"
 required_objects[$i]='ogg_afh'
-cmdline[$i]="ls -l=v -p ${oggs[@]}"
+cmdline[$i]="ls -l=v ${oggs[@]}"
 good[$i]='^attributes_txt: 33'
 
+let i++
+commands[$i]='addmood'
+cmdline[$i]="addmood test-mood"
+
+let i++
+commands[$i]='empty-mood-parameter'
+cmdline[$i]="select m/"
+expect_failure[$i]='true'
+
 let i++
 commands[$i]="term"
 cmdline[$i]="term"
@@ -83,7 +105,7 @@ test_require_executables "ssh-keygen"
 missing_executables="$result"
 
 if [[ -z "$missing_objects" && -z "$missing_executables" ]]; then
-	ssh-keygen -q -t rsa -b 2048 -N "" -f $privkey
+	ssh-keygen -q -t rsa -b 2048 -N "" -m PEM -f $privkey
 	key_gen_result=$?
 
 	read &>/dev/null < /dev/tcp/localhost/$port
@@ -108,6 +130,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
@@ -136,14 +159,19 @@ for ((i=0; i < ${#commands[@]}; i++)); do
 			continue
 		fi
 	fi
-	test_expect_success "$command" "
+	if [[ -n "${expect_failure[$i]}" ]]; then
+		f=test_expect_failure
+	else
+		f=test_expect_success
+	fi
+	$f "$command" "
 	$PARA_CLIENT \
 		--loglevel $loglevel \
 		--server-port $port \
 		--key-file $privkey \
 		--config-file /dev/null \
 		-- \
-		${cmdline[$i]} > $command.out &&
+		${cmdline[$i]} > $command.out < /dev/null &&
 		{ [[ -z \"${good[$i]}\" ]] || grep \"${good[$i]}\"; } < $command.out &&
 		{ [[ -z \"${bad[$i]}\" ]]  || ! grep \"${bad[$i]}\"; } < $command.out
 	"