[svn-commits] dvossel: testsuite/asterisk/trunk r340 - in /asterisk/trunk/tests/mixmonitor:...

[SVN commits to the Digium repositories]

Author: dvossel
Date: Fri Jun  4 11:02:58 2010
New Revision: 340

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=340
Log:
fixes mixmonitor test to be more consistent

Added:
    asterisk/trunk/tests/mixmonitor/sounds/
    asterisk/trunk/tests/mixmonitor/sounds/talking.ulaw   (with props)
Modified:
    asterisk/trunk/tests/mixmonitor/configs/extensions.conf
    asterisk/trunk/tests/mixmonitor/run-test

Modified: asterisk/trunk/tests/mixmonitor/configs/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/mixmonitor/configs/extensions.conf?view=diff&rev=340&r1=339&r2=340
==============================================================================
--- asterisk/trunk/tests/mixmonitor/configs/extensions.conf (original)
+++ asterisk/trunk/tests/mixmonitor/configs/extensions.conf Fri Jun  4 11:02:58 2010
@@ -6,9 +6,7 @@
 
 exten => test1,1,Answer()
 exten => test1,n,MixMonitor(${TESTAUDIO1})
-exten => test1,n,PlayTones(busy)
-exten => test1,n,Wait(3)
-exten => test1,n,StopPlayTones()
+exten => test1,n,Playback(${TALK_AUDIO})
 exten => test1,n,StopMixMonitor()
 
 ;If PlayBack fails, then StopMixMonitor has not yet let go of the file
@@ -21,9 +19,7 @@
 
 ; StopMixMonitor worked, now test stopping on hangup
 exten => test1,n(domore), MixMonitor(${TESTAUDIO2})
-exten => test1,n,PlayTones(busy)
-exten => test1,n,Wait(3)
-exten => test1,n,StopPlayTones()
+exten => test1,n,Playback(${TALK_AUDIO})
 exten => test1,n,HangUp()
 
 
@@ -34,9 +30,7 @@
 exten => test2,n(stopnow2),HangUp()
 
 exten => test2,n(domore2), MixMonitor(${TESTAUDIO3})
-exten => test2,n,PlayTones(busy)
-exten => test2,n,Wait(1)
-exten => test1,n,StopPlayTones()
+exten => test2,n,Playback(${TALK_AUDIO})
 exten => test2,n,HangUp()
 
 

Modified: asterisk/trunk/tests/mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/mixmonitor/run-test?view=diff&rev=340&r1=339&r2=340
==============================================================================
--- asterisk/trunk/tests/mixmonitor/run-test (original)
+++ asterisk/trunk/tests/mixmonitor/run-test Fri Jun  4 11:02:58 2010
@@ -21,8 +21,9 @@
     def __init__(self, argv):
         self.passed = False
         self.last_step = ""
-        self.expectedfilesize = 52000
-        self.filesizetolerance = 9000
+        # playback file is 2559 bytes of ulaw, that will come out to be ~41118 of wav
+        self.expectedfilesize = 41118
+        self.filesizetolerance = 5000
         self.audiofile1size = -1
         self.audiofile2size = -1
         self.audiofile3size = -1
@@ -42,6 +43,7 @@
         self.audiofile2 = os.path.join(os.getcwd(), "tests/mixmonitor/testaudio2")
         self.audiofile3 = os.path.join(os.getcwd(), "tests/mixmonitor/testaudio3")
         self.asterisk.install_config("tests/mixmonitor/configs/extensions.conf")
+        self.talkingaudio = os.path.join(os.getcwd(), "tests/mixmonitor/sounds/talking")
 
     def read_result(self):
         self.log_last_step("Reading result file from MixMonitor")
@@ -99,10 +101,12 @@
             self.asterisk.cli_exec("core set global TESTAUDIO1 " + self.audiofile1)
             self.asterisk.cli_exec("core set global TESTAUDIO2 " + self.audiofile2)
             self.asterisk.cli_exec("core set global TESTAUDIO3 " + self.audiofile3)
+            self.asterisk.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
         else:
             self.asterisk.cli_exec("dialplan set global TESTAUDIO1 " + self.audiofile1)
             self.asterisk.cli_exec("dialplan set global TESTAUDIO2 " + self.audiofile2)
             self.asterisk.cli_exec("dialplan set global TESTAUDIO3 " + self.audiofile3)
+            self.asterisk.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
 
     def stop_asterisk(self):
         self.asterisk.stop()

Added: asterisk/trunk/tests/mixmonitor/sounds/talking.ulaw
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/mixmonitor/sounds/talking.ulaw?view=auto&rev=340
==============================================================================
Binary file - no diff available.

Propchange: asterisk/trunk/tests/mixmonitor/sounds/talking.ulaw
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream