[asterisk-commits] tilghman: branch tilghman/callparking_retrieval r817 - /asterisk/team/tilghma...

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Oct 29 15:52:08 2010
New Revision: 817

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=817
Log:
Mo' bettah

Modified:
    asterisk/team/tilghman/callparking_retrieval/tests/pbx/call-files2/run-test

Modified: asterisk/team/tilghman/callparking_retrieval/tests/pbx/call-files2/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/tilghman/callparking_retrieval/tests/pbx/call-files2/run-test?view=diff&rev=817&r1=816&r2=817
==============================================================================
--- asterisk/team/tilghman/callparking_retrieval/tests/pbx/call-files2/run-test (original)
+++ asterisk/team/tilghman/callparking_retrieval/tests/pbx/call-files2/run-test Fri Oct 29 15:52:08 2010
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set +e
-debug=0
+debug=1
 
 echo " >>> Starting spoolfile test"
 
@@ -46,9 +46,9 @@
 		$ASTERISK -C $userB_tmpdir/asterisk.conf -rx "core stop now" >/dev/null 2>&1
 	fi
 	sleep 2
-	$KILLALL asterisk
+	$KILLALL asterisk >/dev/null 2>&1
 	sleep 1
-	$KILLALL -9 asterisk
+	$KILLALL -9 asterisk >/dev/null 2>&1
 	rm -rf $userA_tmpdir $userB_tmpdir
 	set -e
 }
@@ -106,8 +106,9 @@
 		dst=$conf/`basename $i`
 		install -m 644 $i $dst
 	done
-	( echo "[directories]"; echo "astetcdir => $conf"; echo "astrundir => $conf"; echo "astlogdir => $testdir/$user"; echo "[options]"; echo "verbose = 10"; echo "documentation_language = en_US" ) > $conf/asterisk.conf
+	( echo "[directories]"; echo "astetcdir => $conf"; echo "astrundir => $conf"; echo "astlogdir => $testdir/$user"; echo "astspooldir => $conf/spool" ; echo "[options]"; echo "verbose = 10"; echo "documentation_language = en_US" ) > $conf/asterisk.conf
 	( echo "noload => pbx_lua.so" ; echo "noload => pbx_ael.so" ) >> $conf/modules.conf
+	mkdir -p $conf/spool/outgoing
 
 	# Verify that files got created properly
 	if test -s $conf/asterisk.conf ; then : ; else
@@ -125,7 +126,7 @@
 		exit 1
 	fi
 
-	if test $debug = "1"; then
+	if test $debug -gt 1; then
 		$ASTERISK -C $conf/asterisk.conf -rx 'core set debug 1 pbx_spool'
 		$ASTERISK -C $conf/asterisk.conf -rx 'dialplan show'
 	fi
@@ -133,7 +134,7 @@
 
 echo " >>> Spooling first file"
 create_spool "Local/noanswer at spoolfile" "donothing" > $userA_tmpdir/spoolfile
-mv -f $userA_tmpdir/spoolfile /var/spool/asterisk/outgoing/
+mv -f $userA_tmpdir/spoolfile $userA_tmpdir/spool/outgoing/
 sleep 1
 if test "$debug" = "1"; then
 	for user in userA userB; do
@@ -152,9 +153,9 @@
 
 echo " >>> Spooling second file"
 create_spool "Local/answer at spoolfile" "donothing" > $userA_tmpdir/spoolfile
-mv -f $userA_tmpdir/spoolfile /var/spool/asterisk/outgoing/
+mv -f $userA_tmpdir/spoolfile $userA_tmpdir/spool/outgoing/
 sleep 1
-verify_call $userA_tmpdir 3
+verify_call $userA_tmpdir 2
 
 sleep 5