[asterisk-commits] mjordan: testsuite/asterisk/trunk r2338 - in /asterisk/trunk: lib/python/aste...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Sep 19 08:22:52 CDT 2011
Author: mjordan
Date: Mon Sep 19 08:22:49 2011
New Revision: 2338
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2338
Log:
Tweaked up timing for FreeBSD 1.8 system
Modified:
asterisk/trunk/lib/python/asterisk/TestState.py
asterisk/trunk/tests/apps/voicemail/check_voicemail_callback/run-test
asterisk/trunk/tests/apps/voicemail/check_voicemail_callback/test-config.yaml
asterisk/trunk/tests/apps/voicemail/check_voicemail_delete/run-test
asterisk/trunk/tests/apps/voicemail/check_voicemail_delete/test-config.yaml
asterisk/trunk/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml
asterisk/trunk/tests/apps/voicemail/check_voicemail_envelope/run-test
asterisk/trunk/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml
Modified: asterisk/trunk/lib/python/asterisk/TestState.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/TestState.py?view=diff&rev=2338&r1=2337&r2=2338
==============================================================================
--- asterisk/trunk/lib/python/asterisk/TestState.py (original)
+++ asterisk/trunk/lib/python/asterisk/TestState.py Mon Sep 19 08:22:49 2011
@@ -35,7 +35,7 @@
event The TestEvent
"""
- logger.debug(" Test Event received:")
+ logger.debug("Test Event received:")
for k, v in event.items():
logger.debug("\t" + k + "\t=\t" + v)
@@ -46,8 +46,7 @@
ami The AMI instance that sent us the TestEvent
event The TestEvent
"""
- if (logger.getEffectiveLevel() == logging.DEBUG):
- self.printTestEvent(event)
+ self.printTestEvent(event)
if event['type'] == 'StateChange':
if (self.__currentState != None):
Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_callback/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_callback/run-test?view=diff&rev=2338&r1=2337&r2=2338
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_callback/run-test (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_callback/run-test Mon Sep 19 08:22:49 2011
@@ -276,7 +276,7 @@
return
if event['result'] == "pass":
- if event['number'] == "555-5555":
+ if event['number'] == "555-5555" or event['number'] == "5555555":
self.passed = True
logger.info("VoiceMail successfully exited")
else:
Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_callback/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_callback/test-config.yaml?view=diff&rev=2338&r1=2337&r2=2338
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_callback/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_callback/test-config.yaml Mon Sep 19 08:22:49 2011
@@ -7,6 +7,7 @@
properties:
minversion: '1.8'
+ buildoption: 'TEST_FRAMEWORK'
dependencies:
- python : 'twisted'
- python : 'starpy'
Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_delete/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_delete/run-test?view=diff&rev=2338&r1=2337&r2=2338
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_delete/run-test (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_delete/run-test Mon Sep 19 08:22:49 2011
@@ -127,8 +127,8 @@
message = event['message']
if message == 'instructions':
- """ Delete the message """
- self.voiceMailTest.sendDTMF("7")
+ """ Exit voicemail """
+ self.voiceMailTest.sendDTMF("#")
elif message == 'vm-nomore':
""" Exit voicemail """
self.voiceMailTest.sendDTMF("#")
@@ -165,6 +165,7 @@
elif message == 'vm-nomore':
""" Exit """
self.voiceMailTest.sendDTMF("#")
+ self.changeState(BrowseMessageTestState(self.controller, self.voiceMailTest))
elif state == 'BROWSE':
self.changeState(BrowseMessageTestState(self.controller, self.voiceMailTest))
elif state == 'PLAYVOICE':
@@ -206,7 +207,7 @@
self.addTestCondition("messagesHeard", TestCondition(checkMessages, 0))
self.addTestCondition("messagesDeleted", TestCondition(checkMessages, 0))
- self.reactor_timeout = 90
+ self.reactor_timeout = 120
self.create_asterisk(2)
def ami_connect(self, ami):
Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_delete/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_delete/test-config.yaml?view=diff&rev=2338&r1=2337&r2=2338
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_delete/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_delete/test-config.yaml Mon Sep 19 08:22:49 2011
@@ -7,6 +7,7 @@
properties:
minversion: '1.8'
+ buildoption: 'TEST_FRAMEWORK'
dependencies:
- python : 'twisted'
- python : 'starpy'
Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml?view=diff&rev=2338&r1=2337&r2=2338
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml Mon Sep 19 08:22:49 2011
@@ -6,6 +6,7 @@
properties:
minversion: '1.8'
+ buildoption: 'TEST_FRAMEWORK'
dependencies:
- python : 'twisted'
- python : 'starpy'
Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_envelope/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_envelope/run-test?view=diff&rev=2338&r1=2337&r2=2338
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_envelope/run-test (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_envelope/run-test Mon Sep 19 08:22:49 2011
@@ -127,8 +127,8 @@
message = event['message']
if message == 'instructions':
- """ Save the message """
- self.voiceMailTest.sendDTMF("9")
+ """ Exit voicemail """
+ self.voiceMailTest.sendDTMF("#")
elif message == 'vm-nomore':
""" Exit voicemail """
self.voiceMailTest.sendDTMF("#")
Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml?view=diff&rev=2338&r1=2337&r2=2338
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml Mon Sep 19 08:22:49 2011
@@ -8,6 +8,7 @@
properties:
minversion: '1.8'
+ buildoption: 'TEST_FRAMEWORK'
dependencies:
- python : 'twisted'
- python : 'starpy'
More information about the asterisk-commits
mailing list