[asterisk-commits] mjordan: testsuite/asterisk/trunk r2309 - in /asterisk/trunk/tests/apps/voice...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Sep 16 11:38:00 CDT 2011
Author: mjordan
Date: Fri Sep 16 11:37:58 2011
New Revision: 2309
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2309
Log:
Enabled staged leave_voicemail tests
Modified:
asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/extensions.conf
asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/run-test
asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml
asterisk/trunk/tests/apps/voicemail/leave_voicemail_external_notification/run-test
asterisk/trunk/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml
asterisk/trunk/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml
asterisk/trunk/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml
asterisk/trunk/tests/apps/voicemail/leave_voicemail_priority/run-test
asterisk/trunk/tests/apps/voicemail/tests.yaml
Modified: asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/extensions.conf?view=diff&rev=2309&r1=2308&r2=2309
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/extensions.conf (original)
+++ asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/configs/ast2/extensions.conf Fri Sep 16 11:37:58 2011
@@ -5,7 +5,7 @@
same => n,Wait(3)
same => n,Verbose(1, Sending ${DTMF_TO_SEND} key)
same => n,SendDTMF(${DTMF_TO_SEND})
- same => n,Wait(2)
+ same => n,Wait(10)
same => n,Hangup()
exten => 9000,1,NoOp()
@@ -14,5 +14,5 @@
same => n,Playback(${TALK_AUDIO})
same => n,Verbose(1, Sending ${DTMF_TO_SEND} key)
same => n,SendDTMF(${DTMF_TO_SEND})
- same => n,Wait(2)
+ same => n,Wait(10)
same => n,Hangup()
Modified: asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/run-test?view=diff&rev=2309&r1=2308&r2=2309
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/run-test (original)
+++ asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/run-test Fri Sep 16 11:37:58 2011
@@ -29,15 +29,10 @@
"""
testParentDir = "tests/apps/voicemail"
- """
- Tracks each AMI connection to see if we've received it an executed our dialplan functions
- """
- executed = []
-
def __init__(self):
super(LeaveVoicemailContexts, self).__init__()
- self.reactor_timeout = 60
+ self.reactor_timeout = 45
self.testCounter = 0
self.create_asterisk(2)
self.expectedValues = {'attendant': False, 'operator': False, 'othercontext at 1': False, 'othercontext at 3': False, 'othercontext at operator': False}
@@ -54,7 +49,6 @@
self.ast[ami.id].cli_exec("dialplan set global DTMF_TO_SEND 1")
logger.debug("AMI ID: " + str(ami.id))
- logger.debug("Executed: " + str(self.executed[ami.id]))
if (ami.id != 0):
self.senderAmi = ami
LeaveVoicemailContexts.executeTest(self)
@@ -148,7 +142,7 @@
"""
Verify that we received all expected results
"""
- for k, v in LeaveVoicemailContexts.expectedValues.items():
+ for k, v in test.expectedValues.items():
if not v:
logger.warn("Failed to receive expected result: " + k)
test.passed = False
Modified: asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml?view=diff&rev=2309&r1=2308&r2=2309
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml Fri Sep 16 11:37:58 2011
@@ -11,4 +11,5 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
-
+ - asterisk: 'app_voicemail'
+ - asterisk: 'app_senddtmf'
Modified: asterisk/trunk/tests/apps/voicemail/leave_voicemail_external_notification/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/leave_voicemail_external_notification/run-test?view=diff&rev=2309&r1=2308&r2=2309
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/leave_voicemail_external_notification/run-test (original)
+++ asterisk/trunk/tests/apps/voicemail/leave_voicemail_external_notification/run-test Fri Sep 16 11:37:58 2011
@@ -33,10 +33,10 @@
def __init__(self):
super(LeaveVoicemailExternNotify, self).__init__()
- self.reactor_timeout = 90
+ self.reactor_timeout = 120
self.testCounter = 0
self.expectedValues = {'1234': False, '9000': False, '9001': False, '9002': False, '9003': False}
- self.create_asterisk(self.ast_instances)
+ self.create_asterisk(2)
self.senderAmi = None
def ami_connect(self, ami):
@@ -266,7 +266,7 @@
""" Create the AMI factories
"""
- self.create_ami_factory(self.ast_instances)
+ self.create_ami_factory(2)
def main():
Modified: asterisk/trunk/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml?view=diff&rev=2309&r1=2308&r2=2309
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml Fri Sep 16 11:37:58 2011
@@ -11,4 +11,5 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
-
+ - asterisk: 'app_voicemail'
+ - asterisk: 'app_senddtmf'
Modified: asterisk/trunk/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml?view=diff&rev=2309&r1=2308&r2=2309
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml Fri Sep 16 11:37:58 2011
@@ -12,4 +12,5 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
-
+ - asterisk: 'app_voicemail'
+ - asterisk: 'app_senddtmf'
Modified: asterisk/trunk/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml?view=diff&rev=2309&r1=2308&r2=2309
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml Fri Sep 16 11:37:58 2011
@@ -12,4 +12,5 @@
dependencies:
- python : 'twisted'
- python : 'starpy'
-
+ - asterisk: 'app_voicemail'
+ - asterisk: 'app_senddtmf'
Modified: asterisk/trunk/tests/apps/voicemail/leave_voicemail_priority/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/leave_voicemail_priority/run-test?view=diff&rev=2309&r1=2308&r2=2309
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/leave_voicemail_priority/run-test (original)
+++ asterisk/trunk/tests/apps/voicemail/leave_voicemail_priority/run-test Fri Sep 16 11:37:58 2011
@@ -40,7 +40,6 @@
ami.registerEvent('UserEvent', self.user_event)
if (ami.id != 0):
- self.executed[ami.id] = True
self.ast[ami.id].cli_exec("dialplan set global TALK_AUDIO " + self.audioFile)
df1 = ami.originate("sip/ast1/1234", "sendvoicemail", "1234", 1)
Modified: asterisk/trunk/tests/apps/voicemail/tests.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/tests.yaml?view=diff&rev=2309&r1=2308&r2=2309
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/tests.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/tests.yaml Fri Sep 16 11:37:58 2011
@@ -1,11 +1,11 @@
# Enter tests here in the order they should be considered for execution:
tests:
- test: 'leave_voicemail_nominal'
-# - test: 'leave_voicemail_contexts'
-# - test: 'leave_voicemail_priority'
-# - test: 'leave_voicemail_forwarding'
-# - test: 'leave_voicemail_forwarding_auto_urgent'
-# - test: 'leave_voicemail_external_notification'
+ - test: 'leave_voicemail_contexts'
+ - test: 'leave_voicemail_priority'
+ - test: 'leave_voicemail_forwarding'
+ - test: 'leave_voicemail_forwarding_auto_urgent'
+ - test: 'leave_voicemail_external_notification'
- test: 'func_vmcount'
- test: 'authenticate_nominal'
- test: 'authenticate_invalid_mailbox'
More information about the asterisk-commits
mailing list