[asterisk-commits] pabelanger: branch pabelanger/localhostBindaddr r978 - in /asterisk/team/pabe...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Nov 26 20:44:38 CST 2010


Author: pabelanger
Date: Fri Nov 26 20:44:35 2010
New Revision: 978

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=978
Log:
Sync and automerge

Modified:
    asterisk/team/pabelanger/localhostBindaddr/   (props changed)
    asterisk/team/pabelanger/localhostBindaddr/tests/callparking_retrieval/   (props changed)
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_unanswered_yes/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_userfield/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/configs/ast2/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/configs/ast2/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/configs/ast2/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/configs/ast2/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/configs/ast2/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/configs/ast2/extensions.conf
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/nocdr/run-test

Propchange: asterisk/team/pabelanger/localhostBindaddr/
------------------------------------------------------------------------------
    automerge = *

Propchange: asterisk/team/pabelanger/localhostBindaddr/
------------------------------------------------------------------------------
    svn:mergeinfo = /asterisk/trunk:974-977

Propchange: asterisk/team/pabelanger/localhostBindaddr/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov 26 20:44:35 2010
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-971
+/asterisk/trunk:1-971,974-977

Propchange: asterisk/team/pabelanger/localhostBindaddr/tests/callparking_retrieval/
            ('svn:mergeinfo' removed)

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_unanswered_yes/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_unanswered_yes/run-test?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_unanswered_yes/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_unanswered_yes/run-test Fri Nov 26 20:44:35 2010
@@ -24,14 +24,15 @@
     def __init__(self):
         self.passed = False
 
-        reactor.callLater(60, self.abort)
-
         ast1 = Asterisk(base=workingdir)
         ast1.install_configs("%s/configs/ast1" % (testdir))
 
         ast1.start()
         self.ast1 = ast1
-        self.ami = AMI(self.start, self.abort, timeout=20)
+
+        reactor.callLater(30, self.stop_reactor)
+
+        self.ami = AMI(self.start, self.stop_reactor, timeout=20)
         self.ami.login()
 
     def start(self, ami):
@@ -41,16 +42,15 @@
     def stop_asterisk(self):
         self.ast1.stop()
 
-    def abort(self):
-        print "Aborting ..."
+    def stop_reactor(self):
+        print "Stopping Reactor ..."
+        if reactor.running:
+            reactor.stop()
         self.stop_asterisk()
-        if reactor.running:
-            for call in reactor.getDelayedCalls():
-                call.cancel()
-            reactor.stop()
 
     def end(self, ami, event):
-        self.stop_asterisk()
+        self.stop_reactor()
+
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast1.base))
 
         cdr1_expect = AsteriskCSVCDR(records=[AsteriskCSVCDRLine(accountcode="",
@@ -64,9 +64,6 @@
         else:
             print "Failure"
 
-        reactor.stop()
-
-
 def main():
     logging.basicConfig()
     test = Test()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_userfield/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_userfield/run-test?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_userfield/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_userfield/run-test Fri Nov 26 20:44:35 2010
@@ -24,15 +24,14 @@
     def __init__(self):
         self.passed = False
 
-        reactor.callLater(60, self.abort)
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
-        ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs/ast1" % (testdir))
+        self.ast1.start()
 
-        ast1.start()
+        reactor.callLater(30, self.stop_reactor)
 
-        self.ast1 = ast1
-        self.ami = AMI(self.start, self.abort, timeout=20)
+        self.ami = AMI(self.start, self.stop_reactor, timeout=20)
         self.ami.login()
 
     def start(self, ami):
@@ -42,16 +41,15 @@
     def stop_asterisk(self):
         self.ast1.stop()
 
-    def abort(self):
-        print "Aborting ..."
+    def stop_reactor(self):
+        print "Stopping Reactor ..."
+        if reactor.running:
+            reactor.stop()
         self.stop_asterisk()
-        if reactor.running:
-            for call in reactor.getDelayedCalls():
-                call.cancel()
-            reactor.stop()
 
     def end(self, ami, event):
-        self.stop_asterisk()
+        self.stop_reactor()
+
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast1.base))
 
         cdr1_expect = AsteriskCSVCDR(records=[AsteriskCSVCDRLine(accountcode="",
@@ -65,9 +63,6 @@
         else:
             print "Failure"
 
-        reactor.stop()
-
-
 def main():
     logging.basicConfig()
     test = Test()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/configs/ast2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/configs/ast2/extensions.conf?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/configs/ast2/extensions.conf (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/configs/ast2/extensions.conf Fri Nov 26 20:44:35 2010
@@ -6,5 +6,4 @@
 
 [default]
 exten => 1,1,Answer
-exten => 1,n,Wait(5)
 exten => 1,n,Hangup

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/run-test?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/run-test Fri Nov 26 20:44:35 2010
@@ -24,19 +24,18 @@
     def __init__(self):
         self.passed = False
 
-        reactor.callLater(60, self.abort)
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
-        ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs/ast1" % (testdir))
+        self.ast2 = Asterisk(base=workingdir)
+        self.ast2.install_configs("%s/configs/ast2" % (testdir))
 
-        ast2 = Asterisk(base=workingdir)
-        ast2.install_configs("%s/configs/ast2" % (testdir))
+        self.ast1.start()
+        self.ast2.start()
 
-        ast1.start()
-        ast2.start()
-        self.ast1 = ast1
-        self.ast2 = ast2
-        self.ami = AMI(self.start, self.abort, timeout=20)
+        reactor.callLater(30, self.stop_reactor)
+
+        self.ami = AMI(self.start, self.stop_reactor, timeout=20)
         self.ami.login()
 
     def start(self, ami):
@@ -47,18 +46,16 @@
         self.ast1.stop()
         self.ast2.stop()
 
-    def abort(self):
-        print "Aborting ..."
+    def stop_reactor(self):
+        print "Stopping Reactor ..."
+        if reactor.running:
+            reactor.stop()
         self.stop_asterisk()
-        if reactor.running:
-            for call in reactor.getDelayedCalls():
-                call.cancel()
-            reactor.stop()
 
     def end(self, ami, event):
         if event.get("channel").lower() != "console/dsp":
             return
-        self.stop_asterisk()
+        self.stop_reactor()
 
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast1.base))
         cdr2 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast2.base))
@@ -80,9 +77,6 @@
         else:
             print "Failure"
 
-        reactor.stop()
-
-
 def main():
     logging.basicConfig()
     test = Test()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/configs/ast2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/configs/ast2/extensions.conf?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/configs/ast2/extensions.conf (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/configs/ast2/extensions.conf Fri Nov 26 20:44:35 2010
@@ -6,5 +6,4 @@
 
 [default]
 exten => 1,1,Busy
-exten => 1,n,Wait(5)
 exten => 1,n,Hangup

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/run-test?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/run-test Fri Nov 26 20:44:35 2010
@@ -24,19 +24,18 @@
     def __init__(self):
         self.passed = False
 
-        reactor.callLater(60, self.abort)
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
-        ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs/ast1" % (testdir))
+        self.ast2 = Asterisk(base=workingdir)
+        self.ast2.install_configs("%s/configs/ast2" % (testdir))
 
-        ast2 = Asterisk(base=workingdir)
-        ast2.install_configs("%s/configs/ast2" % (testdir))
+        self.ast1.start()
+        self.ast2.start()
 
-        ast1.start()
-        ast2.start()
-        self.ast1 = ast1
-        self.ast2 = ast2
-        self.ami = AMI(self.start, self.abort, timeout=20)
+        reactor.callLater(30, self.stop_reactor)
+
+        self.ami = AMI(self.start, self.stop_reactor, timeout=20)
         self.ami.login()
 
     def start(self, ami):
@@ -47,19 +46,17 @@
         self.ast1.stop()
         self.ast2.stop()
 
-    def abort(self):
-        print "Aborting ..."
+    def stop_reactor(self):
+        print "Stopping Reactor ..."
+        if reactor.running:
+            reactor.stop()
         self.stop_asterisk()
-        if reactor.running:
-            for call in reactor.getDelayedCalls():
-                call.cancel()
-            reactor.stop()
 
     def end(self, ami, event):
         if event.get('channel').lower() != 'console/dsp':
             return
 
-        self.stop_asterisk()
+        self.stop_reactor()
 
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast1.base))
 
@@ -78,9 +75,6 @@
         else:
             print "Failure"
 
-        reactor.stop()
-
-
 def main():
     logging.basicConfig()
     test = Test()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/configs/ast2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/configs/ast2/extensions.conf?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/configs/ast2/extensions.conf (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/configs/ast2/extensions.conf Fri Nov 26 20:44:35 2010
@@ -6,5 +6,4 @@
 
 [default]
 exten => 1,1,Congestion
-exten => 1,n,Wait(5)
 exten => 1,n,Hangup

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/run-test?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/run-test Fri Nov 26 20:44:35 2010
@@ -24,19 +24,18 @@
     def __init__(self):
         self.passed = False
 
-        reactor.callLater(60, self.abort)
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
-        ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs/ast1" % (testdir))
+        self.ast2 = Asterisk(base=workingdir)
+        self.ast2.install_configs("%s/configs/ast2" % (testdir))
 
-        ast2 = Asterisk(base=workingdir)
-        ast2.install_configs("%s/configs/ast2" % (testdir))
+        self.ast1.start()
+        self.ast2.start()
 
-        ast1.start()
-        ast2.start()
-        self.ast1 = ast1
-        self.ast2 = ast2
-        self.ami = AMI(self.start, self.abort, timeout=20)
+        reactor.callLater(30, self.stop_reactor)
+
+        self.ami = AMI(self.start, self.stop_reactor, timeout=20)
         self.ami.login()
 
     def start(self, ami):
@@ -47,19 +46,17 @@
         self.ast1.stop()
         self.ast2.stop()
 
-    def abort(self):
-        print "Aborting ..."
+    def stop_reactor(self):
+        print "Stopping Reactor ..."
+        if reactor.running:
+            reactor.stop()
         self.stop_asterisk()
-        if reactor.running:
-            for call in reactor.getDelayedCalls():
-                call.cancel()
-            reactor.stop()
 
     def end(self, ami, event):
         if event.get('channel').lower() != "console/dsp":
             return
 
-        self.stop_asterisk()
+        self.stop_reactor()
 
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast1.base))
 
@@ -78,9 +75,6 @@
         else:
             print "Failure"
 
-        reactor.stop()
-
-
 def main():
     logging.basicConfig()
     test = Test()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/configs/ast2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/configs/ast2/extensions.conf?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/configs/ast2/extensions.conf (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/configs/ast2/extensions.conf Fri Nov 26 20:44:35 2010
@@ -8,5 +8,4 @@
 exten => 1,1,Transfer(2)
 
 exten => 2,1,Answer
-exten => 2,n,Wait(5)
 exten => 2,n,Hangup

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/run-test?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/run-test Fri Nov 26 20:44:35 2010
@@ -24,20 +24,18 @@
     def __init__(self):
         self.passed = False
 
-        reactor.callLater(60, self.abort)
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
-        ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs/ast1" % (testdir))
+        self.ast2 = Asterisk(base=workingdir)
+        self.ast2.install_configs("%s/configs/ast2" % (testdir))
 
-        ast2 = Asterisk(base=workingdir)
-        ast2.install_configs("%s/configs/ast2" % (testdir))
+        self.ast1.start()
+        self.ast2.start()
 
-        ast1.start()
-        ast2.start()
+        reactor.callLater(30, self.stop_reactor)
 
-        self.ast1 = ast1
-        self.ast2 = ast2
-        self.ami = AMI(self.start, self.abort, timeout=20)
+        self.ami = AMI(self.start, self.stop_reactor, timeout=20)
         self.ami.login()
 
     def start(self, ami):
@@ -48,19 +46,17 @@
         self.ast1.stop()
         self.ast2.stop()
 
-    def abort(self):
-        print "Aborting ..."
+    def stop_reactor(self):
+        print "Stopping Reactor ..."
+        if reactor.running:
+            reactor.stop()
         self.stop_asterisk()
-        if reactor.running:
-            for call in reactor.getDelayedCalls():
-                call.cancel()
-            reactor.stop()
 
     def end(self, ami, event):
         if event.get('channel').lower() != "console/dsp":
             return
 
-        self.stop_asterisk()
+        self.stop_reactor()
 
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast1.base))
         cdr2 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast2.base))
@@ -87,9 +83,6 @@
         else:
             print "Failure"
 
-        reactor.stop()
-
-
 def main():
     logging.basicConfig()
     test = Test()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/configs/ast2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/configs/ast2/extensions.conf?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/configs/ast2/extensions.conf (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/configs/ast2/extensions.conf Fri Nov 26 20:44:35 2010
@@ -9,5 +9,4 @@
 exten => 1,n,Hangup
 
 exten => 2,1,Answer
-exten => 2,n,Wait(5)
 exten => 2,n,Hangup

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/run-test?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/run-test Fri Nov 26 20:44:35 2010
@@ -24,21 +24,18 @@
     def __init__(self):
         self.passed = False
 
-        reactor.callLater(60, self.abort)
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
-        ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs/ast1" % (testdir))
+        self.ast2 = Asterisk(base=workingdir)
+        self.ast2.install_configs("%s/configs/ast2" % (testdir))
 
-        ast2 = Asterisk(base=workingdir)
-        ast2.install_configs("%s/configs/ast2" % (testdir))
+        self.ast1.start()
+        self.ast2.start()
 
-        ast1.start()
-        ast2.start()
+        reactor.callLater(30, self.stop_reactor)
 
-        self.ast1 = ast1
-        self.ast2 = ast2
-
-        self.ami = AMI(self.start, self.abort, timeout=20)
+        self.ami = AMI(self.start, self.stop_reactor, timeout=20)
         self.ami.login()
 
     def start(self, ami):
@@ -49,19 +46,17 @@
         self.ast1.stop()
         self.ast2.stop()
 
-    def abort(self):
-        print "Aborting ..."
+    def stop_reactor(self):
+        print "Stopping Reactor ..."
+        if reactor.running:
+            reactor.stop()
         self.stop_asterisk()
-        if reactor.running:
-            for call in reactor.getDelayedCalls():
-                call.cancel()
-            reactor.stop()
 
     def end(self, ami, event):
         if event.get('channel').lower() != "console/dsp":
             return
+        self.stop_reactor()
 
-        self.stop_asterisk()
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast1.base))
         cdr2 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast2.base))
 
@@ -100,9 +95,6 @@
         else:
             print "Failure"
 
-        reactor.stop()
-
-
 def main():
     logging.basicConfig()
     test = Test()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/configs/ast2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/configs/ast2/extensions.conf?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/configs/ast2/extensions.conf (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/configs/ast2/extensions.conf Fri Nov 26 20:44:35 2010
@@ -6,5 +6,4 @@
 
 [default]
 exten => 1,1,Answer
-exten => 1,n,Wait(5)
 exten => 1,n,Hangup

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/run-test?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/run-test Fri Nov 26 20:44:35 2010
@@ -24,21 +24,18 @@
     def __init__(self):
         self.passed = False
 
-        reactor.callLater(60, self.abort)
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
-        ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs/ast1" % (testdir))
+        self.ast2 = Asterisk(base=workingdir)
+        self.ast2.install_configs("%s/configs/ast2" % (testdir))
 
-        ast2 = Asterisk(base=workingdir)
-        ast2.install_configs("%s/configs/ast2" % (testdir))
+        self.ast1.start()
+        self.ast2.start()
 
-        ast1.start()
-        ast2.start()
+        reactor.callLater(30, self.stop_reactor)
 
-        self.ast1 = ast1
-        self.ast2 = ast2
-
-        self.ami = AMI(self.start, self.abort, timeout=20)
+        self.ami = AMI(self.start, self.stop_reactor, timeout=20)
         self.ami.login()
 
     def start(self, ami):
@@ -49,19 +46,16 @@
         self.ast1.stop()
         self.ast2.stop()
 
-    def abort(self):
-        print "Aborting ..."
+    def stop_reactor(self):
+        print "Stopping Reactor ..."
+        if reactor.running:
+            reactor.stop()
         self.stop_asterisk()
-        if reactor.running:
-            for call in reactor.getDelayedCalls():
-                call.cancel()
-            reactor.stop()
 
     def end(self, ami, event):
         if event.get('channel').lower() != "console/dsp":
             return
-
-        self.stop_asterisk()
+        self.stop_reactor()
 
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast1.base))
         cdr2 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast2.base))
@@ -95,9 +89,6 @@
         else:
             print "Failure"
 
-        reactor.stop()
-
-
 def main():
     logging.basicConfig()
     test = Test()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/nocdr/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/nocdr/run-test?view=diff&rev=978&r1=977&r2=978
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/nocdr/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/nocdr/run-test Fri Nov 26 20:44:35 2010
@@ -24,16 +24,14 @@
     def __init__(self):
         self.passed = False
 
-        reactor.callLater(60, self.abort)
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
-        ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs/ast1" % (testdir))
+        self.ast1.start()
 
-        ast1.start()
+        reactor.callLater(30, self.stop_reactor)
 
-        self.ast1 = ast1
-
-        self.ami = AMI(self.start, self.abort, timeout=20)
+        self.ami = AMI(self.start, self.stop_reactor, timeout=20)
         self.ami.login()
 
     def start(self, ami):
@@ -43,16 +41,14 @@
     def stop_asterisk(self):
         self.ast1.stop()
 
-    def abort(self):
-        print "Aborting ..."
+    def stop_reactor(self):
+        print "Stopping Reactor ..."
+        if reactor.running:
+            reactor.stop()
         self.stop_asterisk()
-        if reactor.running:
-            for call in reactor.getDelayedCalls():
-                call.cancel()
-            reactor.stop()
 
     def end(self, ami, event):
-        self.stop_asterisk()
+        self.stop_reactor()
 
         print "The failure to open the next CDR is expected"
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast1.base))
@@ -63,9 +59,6 @@
         else:
             print "Failure"
 
-        reactor.stop()
-
-
 def main():
     logging.basicConfig()
     test = Test()




More information about the asterisk-commits mailing list