[svn-commits] pabelanger: testsuite/asterisk/trunk r1183 - in /asterisk/trunk/tests/mixmoni...

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Wed Dec 15 12:57:26 2010
New Revision: 1183

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1183
Log:
Use cli_originate to overcome some issues with chan_oss.

chan_oss only supports 1 concurrent channel, this was causing some timing issues
with the test.  Additionally, most of our remote bamboo agents do not have sound
cards, which chan_oss requires.

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

Modified: asterisk/trunk/tests/mixmonitor/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/mixmonitor/configs/ast1/extensions.conf?view=diff&rev=1183&r1=1182&r2=1183
==============================================================================
--- asterisk/trunk/tests/mixmonitor/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/mixmonitor/configs/ast1/extensions.conf Wed Dec 15 12:57:26 2010
@@ -1,6 +1,10 @@
 [general]
 
 [globals]
+
+[listener]
+exten => s,1,Answer()
+exten => s,n,Echo()
 
 [test1]
 exten => s,1,Answer()

Modified: asterisk/trunk/tests/mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/mixmonitor/run-test?view=diff&rev=1183&r1=1182&r2=1183
==============================================================================
--- asterisk/trunk/tests/mixmonitor/run-test (original)
+++ asterisk/trunk/tests/mixmonitor/run-test Wed Dec 15 12:57:26 2010
@@ -43,6 +43,7 @@
 
         self.ast1 = Asterisk(base=workingdir)
         self.ast1.install_configs("%s/configs/ast1" % (testdir))
+
         self.audiofile1 = os.path.join(os.getcwd(), "%s/testaudio1" % (testdir))
         self.audiofile2 = os.path.join(os.getcwd(), "%s/testaudio2" % (testdir))
         self.audiofile3 = os.path.join(os.getcwd(), "%s/testaudio3" % (testdir))
@@ -88,11 +89,11 @@
 
     def launch_test1(self):
         self.log_last_step("Placing call to test1 exten")
-        self.ast1.cli_exec("console dial s at test1")
+        self.ast1.cli_originate("Local/s at listener extension s at test1")
 
     def launch_test2(self):
         self.log_last_step("Placing call to test2 exten")
-        self.ast1.cli_exec("console dial s at test2")
+        self.ast1.cli_originate("Local/s at listener extension s at test2")
 
     def start_asterisk(self):
         self.log_last_step("Starting Asterisk")
@@ -142,7 +143,7 @@
         self.read_result()
 
     def ami_on_connect1(self, ami):
-        self.log_last_step("Connected to AMI 2")
+        self.log_last_step("Connected to AMI 1")
         self.ami = ami
         self.ami.registerEvent("UserEvent", self.check_test1)
 

Modified: asterisk/trunk/tests/mixmonitor/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/mixmonitor/test-config.yaml?view=diff&rev=1183&r1=1182&r2=1183
==============================================================================
--- asterisk/trunk/tests/mixmonitor/test-config.yaml (original)
+++ asterisk/trunk/tests/mixmonitor/test-config.yaml Wed Dec 15 12:57:26 2010
@@ -8,4 +8,3 @@
     minversion: '1.4'
     dependencies:
         - python : 'twisted'
-        - custom : 'soundcard'