From 2a89e33d0f7c610c37752b7ba2d4914925cc6a8a Mon Sep 17 00:00:00 2001 From: tomash Date: Thu, 7 Sep 2006 10:22:24 +0000 Subject: [PATCH] #1790 don't presume clips exist in the storage during export playlist test --- .../src/modules/storageServer/var/xmlrpc/testRunner.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/livesupport/src/modules/storageServer/var/xmlrpc/testRunner.sh b/livesupport/src/modules/storageServer/var/xmlrpc/testRunner.sh index 7d811c569..3b61792b0 100755 --- a/livesupport/src/modules/storageServer/var/xmlrpc/testRunner.sh +++ b/livesupport/src/modules/storageServer/var/xmlrpc/testRunner.sh @@ -91,11 +91,12 @@ existsAudioClip() { } storeAudioClip() { - MEDIA=../tests/ex1.mp3 + if [ "x$1" = "x" ]; then MEDIA=../tests/ex1.mp3; else MEDIA=$1; fi + if [ "x$2" = "x" ]; then GUNID=""; else GUNID=$2; fi MD5=`md5sum $MEDIA`; for i in $MD5; do MD5=$i; break; done if [ $DEBUG_I ]; then echo "md5=$MD5"; fi echo -n "# storeAudioClipOpen: " - RES=`$XR_CLI storeAudioClipOpen "$SESSID" '' "$METADATA" "stored file.mp3" "$MD5"` || \ + RES=`$XR_CLI storeAudioClipOpen "$SESSID" "$GUNID" "$METADATA" "stored file.mp3" "$MD5"` || \ { ERN=$?; echo $RES; exit $ERN; } unset URL for i in $RES; do if [ -z $URL ] ; then URL=$i; else TOKEN=$i; fi; done @@ -292,6 +293,8 @@ deletePlaylist() { } exportPlaylist() { + storeAudioClip ../tests/0000000000010001 0000000000010001 + storeAudioClip ../tests/0000000000010002 0000000000010002 echo -n "# exportPlaylistOpen (${PLID}): " # RES=`$XR_CLI exportPlaylistOpen $SESSID $PLID smil` || \ RES=`$XR_CLI exportPlaylistOpen $SESSID $PLID lspl` || \