[asterisk-commits] qwell: testsuite/asterisk/trunk r1840 - in /asterisk/trunk/tests/cdr/nocdr: ....

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Aug 15 16:17:14 2011
New Revision: 1840

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1840
Log:
Remove soundcard dependency from cdr/nocdr/

Modified:
    asterisk/trunk/tests/cdr/nocdr/configs/ast1/extensions.conf
    asterisk/trunk/tests/cdr/nocdr/run-test
    asterisk/trunk/tests/cdr/nocdr/test-config.yaml

Modified: asterisk/trunk/tests/cdr/nocdr/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/nocdr/configs/ast1/extensions.conf?view=diff&rev=1840&r1=1839&r2=1840
==============================================================================
--- asterisk/trunk/tests/cdr/nocdr/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/cdr/nocdr/configs/ast1/extensions.conf Mon Aug 15 16:17:14 2011
@@ -5,6 +5,6 @@
 [globals]
 
 [default]
-exten => 1,1,Answer
-exten => 1,n,NoCDR
-exten => 1,n,Hangup
+exten => 1,1,Answer()
+exten => 1,n,NoCDR()
+exten => 1,n,Hangup()

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=1840&r1=1839&r2=1840
==============================================================================
--- asterisk/trunk/tests/cdr/nocdr/run-test (original)
+++ asterisk/trunk/tests/cdr/nocdr/run-test Mon Aug 15 16:17:14 2011
@@ -36,7 +36,7 @@
 
     def start(self, ami):
         ami.registerEvent('Hangup', self.end)
-        self.ast1.cli_exec("console dial 1 at default")
+        ami.originate(channel = "Local/1 at default", application = "Echo")
 
     def stop_asterisk(self):
         self.ast1.stop()
@@ -53,7 +53,8 @@
         print "The failure to open the next CDR is expected"
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.ast1.base))
 
-        if len(cdr1) == 0:
+        if len(cdr1) == 1 and cdr1[0].lastapp == "Echo":
+            # There will be 1 CDR record for the second end of the originated channel.
             print "Success"
             self.passed = True
         else:

Modified: asterisk/trunk/tests/cdr/nocdr/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/nocdr/test-config.yaml?view=diff&rev=1840&r1=1839&r2=1840
==============================================================================
--- asterisk/trunk/tests/cdr/nocdr/test-config.yaml (original)
+++ asterisk/trunk/tests/cdr/nocdr/test-config.yaml Mon Aug 15 16:17:14 2011
@@ -8,4 +8,3 @@
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
-        - custom : 'soundcard'