[svn-commits] mnick: branch mnick/gsoc2010 r664 - in /asterisk/team/mnick/gsoc2010/trunk/te...

[SVN commits to the Digium repositories]

Author: mnick
Date: Thu Jul 29 18:00:38 2010
New Revision: 664

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=664
Log:
added some changes, improved version

Removed:
    asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/logger.conf
    asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/logger.conf
Modified:
    asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/features.conf
    asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/run-test

Modified: asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/features.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/features.conf?view=diff&rev=664&r1=663&r2=664
==============================================================================
--- asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/features.conf (original)
+++ asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/features.conf Thu Jul 29 18:00:38 2010
@@ -6,4 +6,3 @@
 
 [featuremap]
 parkcall => #72        ; Park call (one step parking)  -- Make sure to set the K and/or k option in the Dial() app call!
-

Modified: asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/run-test?view=diff&rev=664&r1=663&r2=664
==============================================================================
--- asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/run-test (original)
+++ asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/run-test Thu Jul 29 18:00:38 2010
@@ -22,6 +22,7 @@
 class OneStepParkingTest:
     def __init__(self, argv):
         self.passed = False
+        self.done = False
 
         # Test timeout in seconds
         self.timeout = 60
@@ -45,13 +46,11 @@
         self.asterisk1 = Asterisk(base="/tmp/asterisk-testsuite/one-step-parking")
         self.asterisk1.install_config("tests/one-step-parking/configs/extensions.conf")
         self.asterisk1.install_config("tests/one-step-parking/configs/iax.conf")
-        self.asterisk1.install_config("tests/one-step-parking/configs/logger.conf")
         self.asterisk1.install_config("tests/one-step-parking/configs/features.conf")
 
         self.asterisk2 = Asterisk(base="/tmp/asterisk-testsuite/one-step-parking")
         self.asterisk2.install_config("tests/one-step-parking/configs2/extensions.conf")
         self.asterisk2.install_config("tests/one-step-parking/configs2/iax.conf")
-        self.asterisk2.install_config("tests/one-step-parking/configs2/logger.conf")
 
     # This gets invoked by the dialplan when userA gets parked (701) and userB is trying to retrieve userA by dialing 701
     def get_result_dial_a(self, agi):
@@ -73,6 +72,10 @@
         return sequence()
 
     def read_result(self):
+        if self.done:
+           return
+        self.done = True
+
         self.log_last_step("Reading results")
         self.asterisk1.cli_exec("core show locks")   # get lock output in case of deadlock before tearing down.
         self.asterisk2.cli_exec("core show locks")   # get lock output in case of deadlock before tearing down.