[svn-commits] twilson: testsuite/asterisk/trunk r272 - in /asterisk/trunk/tests/cdr: consol...

[SVN commits to the Digium repositories]

Author: twilson
Date: Thu Apr 29 18:14:00 2010
New Revision: 272

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=272
Log:
Warn users when we expect a CDR opening to fail

Modified:
    asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test
    asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test
    asterisk/trunk/tests/cdr/nocdr/run-test

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=272&r1=271&r2=272
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_busy/run-test Thu Apr 29 18:14:00 2010
@@ -43,7 +43,6 @@
         self.ami.login()
 
     def start(self, ami):
-        print "Doing test"
         ami.registerEvent('Hangup', self.end)
         self.asterisk1.cli_exec("console dial 1 at default")
 
@@ -56,10 +55,11 @@
         reactor.stop()
 
     def end(self, ami, event):
-        print "Ending test"
         self.stop_asterisk()
 
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk1.base))
+
+        print "The failure to open the next CDR is expected"
         cdr2 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk2.base))
 
         cdr1_expect = AsteriskCSVCDR(records=[AsteriskCSVCDRLine(accountcode="",

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=272&r1=271&r2=272
==============================================================================
--- asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test (original)
+++ asterisk/trunk/tests/cdr/console_dial_sip_congestion/run-test Thu Apr 29 18:14:00 2010
@@ -43,7 +43,6 @@
         self.ami.login()
 
     def start(self, ami):
-        print "Doing test"
         ami.registerEvent('Hangup', self.end)
         self.asterisk1.cli_exec("console dial 1 at default")
 
@@ -56,10 +55,11 @@
         reactor.stop()
 
     def end(self, ami, event):
-        print "Ending test"
         self.stop_asterisk()
 
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk1.base))
+
+        print "The failure to open the next CDR is expected"
         cdr2 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk2.base))
 
         cdr1_expect = AsteriskCSVCDR(records=[AsteriskCSVCDRLine(accountcode="",

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=272&r1=271&r2=272
==============================================================================
--- asterisk/trunk/tests/cdr/nocdr/run-test (original)
+++ asterisk/trunk/tests/cdr/nocdr/run-test Thu Apr 29 18:14:00 2010
@@ -49,6 +49,8 @@
 
     def end(self, ami, event):
         self.stop_asterisk()
+
+        print "The failure to open the next CDR is expected"
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk1.base))
 
         if len(cdr1) == 0: