[svn-commits] pabelanger: testsuite/asterisk/trunk r974 - in /asterisk/trunk/tests/cdr: cdr...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Nov 26 19:31:03 CST 2010
Author: pabelanger
Date: Fri Nov 26 19:31:01 2010
New Revision: 974
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=974
Log:
CDR tests performance improvments
Specifically, the reactor should be started after the Asterisk instances have
been launched. Also remove unneeded Wait(5) statements and decrease reactor
timeout to 30 seconds.
Modified:
asterisk/trunk/tests/cdr/cdr_unanswered_yes/run-test
asterisk/trunk/tests/cdr/cdr_userfield/run-test
asterisk/trunk/tests/cdr/console_dial_sip_answer/configs2/extensions.conf
asterisk/trunk/tests/cdr/console_dial_sip_answer/run-test
asterisk/trunk/tests/cdr/console_dial_sip_busy/configs2/extensions.conf
asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test
asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs2/extensions.conf
asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test
asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs2/extensions.conf
asterisk/trunk/tests/cdr/console_dial_sip_transfer/run-test
asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs2/extensions.conf
asterisk/trunk/tests/cdr/console_fork_after_busy_forward/run-test
asterisk/trunk/tests/cdr/console_fork_before_dial/configs2/extensions.conf
asterisk/trunk/tests/cdr/console_fork_before_dial/run-test
asterisk/trunk/tests/cdr/nocdr/run-test
Modified: asterisk/trunk/tests/cdr/cdr_unanswered_yes/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_unanswered_yes/run-test?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_unanswered_yes/run-test (original)
+++ asterisk/trunk/tests/cdr/cdr_unanswered_yes/run-test Fri Nov 26 19:31:01 2010
@@ -24,14 +24,15 @@
def __init__(self):
self.passed = False
- reactor.callLater(60, self.abort)
-
asterisk1 = Asterisk(base=workingdir)
asterisk1.install_configs("%s/configs" % (testdir))
asterisk1.start()
+
+ reactor.callLater(30, self.stop_reactor)
+
self.asterisk1 = asterisk1
- 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):
@@ -41,16 +42,15 @@
def stop_asterisk(self):
self.asterisk1.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.asterisk1.base))
cdr1_expect = AsteriskCSVCDR(records=[AsteriskCSVCDRLine(accountcode="",
@@ -64,9 +64,6 @@
else:
print "Failure"
- reactor.stop()
-
-
def main():
logging.basicConfig()
test = Test()
Modified: asterisk/trunk/tests/cdr/cdr_userfield/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/cdr_userfield/run-test?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/cdr_userfield/run-test (original)
+++ asterisk/trunk/tests/cdr/cdr_userfield/run-test Fri Nov 26 19:31:01 2010
@@ -24,15 +24,15 @@
def __init__(self):
self.passed = False
- reactor.callLater(60, self.abort)
-
asterisk1 = Asterisk(base=workingdir)
asterisk1.install_configs("%s/configs" % (testdir))
asterisk1.start()
+ reactor.callLater(30, self.stop_reactor)
+
self.asterisk1 = asterisk1
- 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 +42,15 @@
def stop_asterisk(self):
self.asterisk1.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.asterisk1.base))
cdr1_expect = AsteriskCSVCDR(records=[AsteriskCSVCDRLine(accountcode="",
@@ -65,9 +64,6 @@
else:
print "Failure"
- reactor.stop()
-
-
def main():
logging.basicConfig()
test = Test()
Modified: asterisk/trunk/tests/cdr/console_dial_sip_answer/configs2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_answer/configs2/extensions.conf?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_answer/configs2/extensions.conf (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_answer/configs2/extensions.conf Fri Nov 26 19:31:01 2010
@@ -6,5 +6,4 @@
[default]
exten => 1,1,Answer
-exten => 1,n,Wait(5)
exten => 1,n,Hangup
Modified: asterisk/trunk/tests/cdr/console_dial_sip_answer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_answer/run-test?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_answer/run-test (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_answer/run-test Fri Nov 26 19:31:01 2010
@@ -24,8 +24,6 @@
def __init__(self):
self.passed = False
- reactor.callLater(60, self.abort)
-
asterisk1 = Asterisk(base=workingdir)
asterisk1.install_configs("%s/configs1" % (testdir))
@@ -34,9 +32,12 @@
asterisk1.start()
asterisk2.start()
+
+ reactor.callLater(30, self.stop_reactor)
+
self.asterisk1 = asterisk1
self.asterisk2 = asterisk2
- 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):
@@ -47,18 +48,17 @@
self.asterisk1.stop()
self.asterisk2.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.asterisk1.base))
cdr2 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk2.base))
@@ -80,9 +80,6 @@
else:
print "Failure"
- reactor.stop()
-
-
def main():
logging.basicConfig()
test = Test()
Modified: asterisk/trunk/tests/cdr/console_dial_sip_busy/configs2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_busy/configs2/extensions.conf?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_busy/configs2/extensions.conf (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_busy/configs2/extensions.conf Fri Nov 26 19:31:01 2010
@@ -6,5 +6,4 @@
[default]
exten => 1,1,Busy
-exten => 1,n,Wait(5)
exten => 1,n,Hangup
Modified: asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test Fri Nov 26 19:31:01 2010
@@ -24,8 +24,6 @@
def __init__(self):
self.passed = False
- reactor.callLater(60, self.abort)
-
asterisk1 = Asterisk(base=workingdir)
asterisk1.install_configs("%s/configs1" % (testdir))
@@ -34,9 +32,12 @@
asterisk1.start()
asterisk2.start()
+
+ reactor.callLater(30, self.stop_reactor)
+
self.asterisk1 = asterisk1
self.asterisk2 = asterisk2
- 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):
@@ -47,19 +48,17 @@
self.asterisk1.stop()
self.asterisk2.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.asterisk1.base))
@@ -78,9 +77,6 @@
else:
print "Failure"
- reactor.stop()
-
-
def main():
logging.basicConfig()
test = Test()
Modified: asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs2/extensions.conf?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs2/extensions.conf (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs2/extensions.conf Fri Nov 26 19:31:01 2010
@@ -6,5 +6,4 @@
[default]
exten => 1,1,Congestion
-exten => 1,n,Wait(5)
exten => 1,n,Hangup
Modified: asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test Fri Nov 26 19:31:01 2010
@@ -24,8 +24,6 @@
def __init__(self):
self.passed = False
- reactor.callLater(60, self.abort)
-
asterisk1 = Asterisk(base=workingdir)
asterisk1.install_configs("%s/configs1" % (testdir))
@@ -34,9 +32,12 @@
asterisk1.start()
asterisk2.start()
+
+ reactor.callLater(30, self.stop_reactor)
+
self.asterisk1 = asterisk1
self.asterisk2 = asterisk2
- 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):
@@ -47,19 +48,17 @@
self.asterisk1.stop()
self.asterisk2.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.asterisk1.base))
@@ -78,9 +77,6 @@
else:
print "Failure"
- reactor.stop()
-
-
def main():
logging.basicConfig()
test = Test()
Modified: asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs2/extensions.conf?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs2/extensions.conf (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs2/extensions.conf Fri Nov 26 19:31:01 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/trunk/tests/cdr/console_dial_sip_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_dial_sip_transfer/run-test?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_transfer/run-test (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_transfer/run-test Fri Nov 26 19:31:01 2010
@@ -24,8 +24,6 @@
def __init__(self):
self.passed = False
- reactor.callLater(60, self.abort)
-
asterisk1 = Asterisk(base=workingdir)
asterisk1.install_configs("%s/configs1" % (testdir))
@@ -35,9 +33,11 @@
asterisk1.start()
asterisk2.start()
+ reactor.callLater(30, self.stop_reactor)
+
self.asterisk1 = asterisk1
self.asterisk2 = asterisk2
- 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 +48,17 @@
self.asterisk1.stop()
self.asterisk2.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.asterisk1.base))
cdr2 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk2.base))
@@ -87,9 +85,6 @@
else:
print "Failure"
- reactor.stop()
-
-
def main():
logging.basicConfig()
test = Test()
Modified: asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs2/extensions.conf?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs2/extensions.conf (original)
+++ asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs2/extensions.conf Fri Nov 26 19:31:01 2010
@@ -9,5 +9,4 @@
exten => 1,n,Hangup
exten => 2,1,Answer
-exten => 2,n,Wait(5)
exten => 2,n,Hangup
Modified: asterisk/trunk/tests/cdr/console_fork_after_busy_forward/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_fork_after_busy_forward/run-test?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_fork_after_busy_forward/run-test (original)
+++ asterisk/trunk/tests/cdr/console_fork_after_busy_forward/run-test Fri Nov 26 19:31:01 2010
@@ -24,8 +24,6 @@
def __init__(self):
self.passed = False
- reactor.callLater(60, self.abort)
-
asterisk1 = Asterisk(base=workingdir)
asterisk1.install_configs("%s/configs1" % (testdir))
@@ -35,10 +33,12 @@
asterisk1.start()
asterisk2.start()
+ reactor.callLater(30, self.stop_reactor)
+
self.asterisk1 = asterisk1
self.asterisk2 = asterisk2
- 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 +49,17 @@
self.asterisk1.stop()
self.asterisk2.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.asterisk1.base))
cdr2 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk2.base))
@@ -100,9 +98,6 @@
else:
print "Failure"
- reactor.stop()
-
-
def main():
logging.basicConfig()
test = Test()
Modified: asterisk/trunk/tests/cdr/console_fork_before_dial/configs2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_fork_before_dial/configs2/extensions.conf?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_fork_before_dial/configs2/extensions.conf (original)
+++ asterisk/trunk/tests/cdr/console_fork_before_dial/configs2/extensions.conf Fri Nov 26 19:31:01 2010
@@ -6,5 +6,4 @@
[default]
exten => 1,1,Answer
-exten => 1,n,Wait(5)
exten => 1,n,Hangup
Modified: asterisk/trunk/tests/cdr/console_fork_before_dial/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/console_fork_before_dial/run-test?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/console_fork_before_dial/run-test (original)
+++ asterisk/trunk/tests/cdr/console_fork_before_dial/run-test Fri Nov 26 19:31:01 2010
@@ -24,8 +24,6 @@
def __init__(self):
self.passed = False
- reactor.callLater(60, self.abort)
-
asterisk1 = Asterisk(base=workingdir)
asterisk1.install_configs("%s/configs1" % (testdir))
@@ -35,10 +33,12 @@
asterisk1.start()
asterisk2.start()
+ reactor.callLater(30, self.stop_reactor)
+
self.asterisk1 = asterisk1
self.asterisk2 = asterisk2
- 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 +49,16 @@
self.asterisk1.stop()
self.asterisk2.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.asterisk1.base))
cdr2 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk2.base))
@@ -95,9 +92,6 @@
else:
print "Failure"
- reactor.stop()
-
-
def main():
logging.basicConfig()
test = Test()
Modified: asterisk/trunk/tests/cdr/nocdr/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/nocdr/run-test?view=diff&rev=974&r1=973&r2=974
==============================================================================
--- asterisk/trunk/tests/cdr/nocdr/run-test (original)
+++ asterisk/trunk/tests/cdr/nocdr/run-test Fri Nov 26 19:31:01 2010
@@ -24,16 +24,16 @@
def __init__(self):
self.passed = False
- reactor.callLater(60, self.abort)
-
asterisk1 = Asterisk(base=workingdir)
asterisk1.install_configs("%s/configs" % (testdir))
asterisk1.start()
+ reactor.callLater(30, self.stop_reactor)
+
self.asterisk1 = asterisk1
- 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 +43,14 @@
def stop_asterisk(self):
self.asterisk1.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_reator()
print "The failure to open the next CDR is expected"
cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk1.base))
@@ -63,9 +61,6 @@
else:
print "Failure"
- reactor.stop()
-
-
def main():
logging.basicConfig()
test = Test()
More information about the svn-commits
mailing list