[asterisk-commits] mjordan: testsuite/asterisk/trunk r2517 - in /asterisk/trunk/tests/apps/voice...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Oct 12 09:15:51 2011
New Revision: 2517

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2517
Log:
Changed to be more tolerant of timing to fix errors on FreeBSD 8.1, trunk

Modified:
    asterisk/trunk/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/extensions.conf
    asterisk/trunk/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test
    asterisk/trunk/tests/apps/voicemail/check_voicemail_options_change_password/run-test

Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/extensions.conf?view=diff&rev=2517&r1=2516&r2=2517
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/extensions.conf (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_forward_with_prepend/configs/ast2/extensions.conf Wed Oct 12 09:15:51 2011
@@ -19,6 +19,13 @@
 	same => n,SendDTMF(${DTMF_TO_SEND})
 	same => n,Goto(voicemailCaller,wait,1)
 
+exten => sendAudioWithPound,1,NoOp()
+	same => n,Verbose(1, Sending audio file ${TALK_AUDIO})
+	same => n,Playback(${TALK_AUDIO})
+	same => n,Verbose(1, Sending DTMF Signal #)
+	same => n,SendDTMF(#)
+	same => n,Goto(voicemailCaller,wait,1)
+
 exten => hangup,1,NoOp()
 	same => n,Verbose(1, Hanging up)
 	same => n,Hangup()

Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test?view=diff&rev=2517&r1=2516&r2=2517
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_forward_with_prepend/run-test Wed Oct 12 09:15:51 2011
@@ -194,9 +194,14 @@
                 """ Press 1 to prepend a message """
                 self.voiceMailTest.sendDTMF("1")
             elif message == 'beep':
-                """ Instruct it to foward the audio """
+                """
+                Instruct it to foward the audio.  Note that on some systems, changing the DTMF
+                and the TALK_AUDIO variables takes too much time - here we use an explicit extension to avoid
+                having to set the DTMF.
+                """
                 audioFile = os.path.join(os.getcwd(), "%s/sounds/talking" % (self.voiceMailTest.testParentDir))
-                self.voiceMailTest.sendSoundFileWithDTMF(audioFile,"#")
+                self.voiceMailTest.astSender.cli_exec("dialplan set global TALK_AUDIO " + audioFile)
+                df = self.voiceMailTest.amiSender.redirect(self.voiceMailTest.senderChannel, "voicemailCaller", "sendAudioWithPound", 1)
             elif message == 'vm-msgsaved':
                 self.voiceMailTest.setTestCondition("msgForwarded", True)
             elif message == 'pbx-invalid':

Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_options_change_password/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_options_change_password/run-test?view=diff&rev=2517&r1=2516&r2=2517
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_options_change_password/run-test (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_options_change_password/run-test Wed Oct 12 09:15:51 2011
@@ -155,6 +155,7 @@
                 """ Back at main menu; exit """
                 self.voiceMailTest.sendDTMF("#")
             elif message == 'vm-newpassword':
+                self.voiceMailTest.reset_timeout()
                 self.voiceMailTest.sendDTMF(self.passwords[self.passwordCounter])
                 self.voiceMailTest.setTestCondition("passwordAttempt",1)
             elif message == 'vm-reenterpassword':