[asterisk-commits] mjordan: testsuite/asterisk/trunk r2224 - in /asterisk/trunk: lib/python/aste...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Sep 14 15:40:20 CDT 2011
Author: mjordan
Date: Wed Sep 14 15:40:15 2011
New Revision: 2224
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2224
Log:
Add Lock pre- and post-test condition checking
This adds the ability to check for help locks before and after
test execution.
Review: https://reviewboard.asterisk.org/r/1435/
(closes issue ASTERISK-18431)
Added:
asterisk/trunk/lib/python/asterisk/LockTestCondition.py
- copied unchanged from r2223, asterisk/team/mjordan/test_conditions/trunk/lib/python/asterisk/LockTestCondition.py
Modified:
asterisk/trunk/lib/python/asterisk/TestCase.py
asterisk/trunk/tests/apps/voicemail/authenticate_nominal/test-config.yaml
asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml
asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml
asterisk/trunk/tests/apps/voicemail/func_vmcount/test-config.yaml
asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml
Modified: asterisk/trunk/lib/python/asterisk/TestCase.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/TestCase.py?view=diff&rev=2224&r1=2223&r2=2224
==============================================================================
--- asterisk/trunk/lib/python/asterisk/TestCase.py (original)
+++ asterisk/trunk/lib/python/asterisk/TestCase.py Wed Sep 14 15:40:15 2011
@@ -169,15 +169,6 @@
start_asterisk. Note that this should be called after the reactor has
returned from its run.
"""
- for amiInstance in self.ami:
- try:
- logger.debug("Logging off of AMI instance %d" % amiInstance.id)
- amiInstance.logoff()
- except:
- logger.warning("Exception occurred while logging off of AMI instance %d" % amiInstance.id)
-
- """ Pause for one second to allow dialplan to catch up with AMI logoffs """
- time.sleep(1)
self.testConditionController.evaluate_post_checks()
for index, item in enumerate(self.ast):
logger.info("Stopping Asterisk instance %d" % (index + 1))
Modified: asterisk/trunk/tests/apps/voicemail/authenticate_nominal/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/authenticate_nominal/test-config.yaml?view=diff&rev=2224&r1=2223&r2=2224
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/authenticate_nominal/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/authenticate_nominal/test-config.yaml Wed Sep 14 15:40:15 2011
@@ -15,6 +15,12 @@
name: 'asterisk.ThreadTestCondition.ThreadPostTestCondition'
type: 'Post'
relatedCondition: 'ThreadPreTestCondition'
+ -
+ name: 'asterisk.LockTestCondition.LockTestCondition'
+ type: 'Pre'
+ -
+ name: 'asterisk.LockTestCondition.LockTestCondition'
+ type: 'Post'
dependencies:
- python : 'twisted'
- python : 'starpy'
Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml?view=diff&rev=2224&r1=2223&r2=2224
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml Wed Sep 14 15:40:15 2011
@@ -16,10 +16,15 @@
name: 'asterisk.ThreadTestCondition.ThreadPostTestCondition'
type: 'Post'
relatedCondition: 'ThreadPreTestCondition'
+ -
+ name: 'asterisk.LockTestCondition.LockTestCondition'
+ type: 'Pre'
+ -
+ name: 'asterisk.LockTestCondition.LockTestCondition'
+ type: 'Post'
dependencies:
- python : 'twisted'
- python : 'starpy'
- asterisk : 'app_voicemail'
- asterisk : 'app_senddtmf'
- asterisk : 'app_playback'
- - buildoption: 'TEST_FRAMEWORK'
Modified: asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml?view=diff&rev=2224&r1=2223&r2=2224
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml Wed Sep 14 15:40:15 2011
@@ -15,9 +15,14 @@
name: 'asterisk.ThreadTestCondition.ThreadPostTestCondition'
type: 'Post'
relatedCondition: 'ThreadPreTestCondition'
+ -
+ name: 'asterisk.LockTestCondition.LockTestCondition'
+ type: 'Pre'
+ -
+ name: 'asterisk.LockTestCondition.LockTestCondition'
+ type: 'Post'
dependencies:
- python : 'twisted'
- python : 'starpy'
- asterisk : 'app_voicemail'
- asterisk : 'app_senddtmf'
- - buildoption: 'TEST_FRAMEWORK'
Modified: asterisk/trunk/tests/apps/voicemail/func_vmcount/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/func_vmcount/test-config.yaml?view=diff&rev=2224&r1=2223&r2=2224
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/func_vmcount/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/func_vmcount/test-config.yaml Wed Sep 14 15:40:15 2011
@@ -15,6 +15,12 @@
name: 'asterisk.ThreadTestCondition.ThreadPostTestCondition'
type: 'Post'
relatedCondition: 'ThreadPreTestCondition'
+ -
+ name: 'asterisk.LockTestCondition.LockTestCondition'
+ type: 'Pre'
+ -
+ name: 'asterisk.LockTestCondition.LockTestCondition'
+ type: 'Post'
dependencies:
- python : 'twisted'
- python : 'starpy'
Modified: asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml?view=diff&rev=2224&r1=2223&r2=2224
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml Wed Sep 14 15:40:15 2011
@@ -16,6 +16,12 @@
name: 'asterisk.ThreadTestCondition.ThreadPostTestCondition'
type: 'Post'
relatedCondition: 'ThreadPreTestCondition'
+ -
+ name: 'asterisk.LockTestCondition.LockTestCondition'
+ type: 'Pre'
+ -
+ name: 'asterisk.LockTestCondition.LockTestCondition'
+ type: 'Post'
dependencies:
- python : 'twisted'
- python : 'starpy'
More information about the asterisk-commits
mailing list