[svn-commits] mjordan: testsuite/asterisk/trunk r2557 - in /asterisk/trunk: lib/python/aste...

[SVN commits to the Digium repositories]

Author: mjordan
Date: Wed Oct 12 16:23:42 2011
New Revision: 2557

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2557
Log:
Tweaked callparking test to use Wait instead of Playback to avoid resources
being left around at end of test.  Added 5 second delay to checking for
pessimistic mode post-test conditions.

Modified:
    asterisk/trunk/lib/python/asterisk/TestConditions.py
    asterisk/trunk/tests/callparking/configs/ast1/extensions.conf
    asterisk/trunk/tests/callparking/configs/ast2/extensions.conf

Modified: asterisk/trunk/lib/python/asterisk/TestConditions.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/TestConditions.py?view=diff&rev=2557&r1=2556&r2=2557
==============================================================================
--- asterisk/trunk/lib/python/asterisk/TestConditions.py (original)
+++ asterisk/trunk/lib/python/asterisk/TestConditions.py Wed Oct 12 16:23:42 2011
@@ -9,6 +9,7 @@
 
 import logging
 import logging.config
+import time
 
 from buildoptions import AsteriskBuildOptions
 from TestConfig import TestConfig
@@ -105,15 +106,18 @@
         """
         Evaluate the pre-test conditions
         """
-        logger.debug("Evaluating pre checks")
-        self.__evaluate_checks(self.__prechecks)
+        if (len(self.__prechecks) > 0):
+            logger.debug("Evaluating pre checks")
+            self.__evaluate_checks(self.__prechecks)
 
     def evaluate_post_checks(self):
         """
         Evaluate the post-test conditions
         """
-        logger.debug("Evaluating post checks")
-        self.__evaluate_checks(self.__postchecks)
+        if (len(self.__postchecks) > 0):
+            time.sleep(5)
+            logger.debug("Evaluating post checks")
+            self.__evaluate_checks(self.__postchecks)
 
     def __evaluate_checks(self, check_list):
         """ Register the instances of Asterisk and evaluate """

Modified: asterisk/trunk/tests/callparking/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/callparking/configs/ast1/extensions.conf?view=diff&rev=2557&r1=2556&r2=2557
==============================================================================
--- asterisk/trunk/tests/callparking/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/callparking/configs/ast1/extensions.conf Wed Oct 12 16:23:42 2011
@@ -14,7 +14,7 @@
 
 exten => 5432,1,SendDTMF(3w4w5w6w)
 exten => 5432,n,UserEvent(ast1, status: SUCCESS)
-exten => 5432,n,Playback(demo-congrats)
+exten => 5432,n,Wait(1)
 exten => 5432,n,Hangup()
 
 include => parkedcalls

Modified: asterisk/trunk/tests/callparking/configs/ast2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/callparking/configs/ast2/extensions.conf?view=diff&rev=2557&r1=2556&r2=2557
==============================================================================
--- asterisk/trunk/tests/callparking/configs/ast2/extensions.conf (original)
+++ asterisk/trunk/tests/callparking/configs/ast2/extensions.conf Wed Oct 12 16:23:42 2011
@@ -19,5 +19,5 @@
 exten => s,n,Hangup()
 
 exten => 3456,1,UserEvent(ast2, status: SUCCESS)
-exten => 3456,n,Playback(demo-congrats)
+exten => 3456,n,Wait(1)
 exten => 3456,n,Hangup()