[asterisk-commits] qwell: testsuite/asterisk/trunk r1873 - /asterisk/trunk/tests/directed_pickup/

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Aug 19 11:56:26 2011
New Revision: 1873

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1873
Log:
Remove soundcard dependency from tests/directed_pickup/

Modified:
    asterisk/trunk/tests/directed_pickup/run-test
    asterisk/trunk/tests/directed_pickup/test-config.yaml

Modified: asterisk/trunk/tests/directed_pickup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/directed_pickup/run-test?view=diff&rev=1873&r1=1872&r2=1873
==============================================================================
--- asterisk/trunk/tests/directed_pickup/run-test (original)
+++ asterisk/trunk/tests/directed_pickup/run-test Fri Aug 19 11:56:26 2011
@@ -82,8 +82,6 @@
 
     # set the result, schedule next step
     def handle_result(self, result):
-        self.ast1.cli_exec("console hangup")
-
         if self.test1_res == NOT_RUN:
             self.log_last_step("Pickup Test 1 results came in.")
             self.test1_res = result
@@ -113,7 +111,10 @@
 
     def test1_pickup(self):
         self.log_last_step("Issuing the pickup")
-        self.ast1.cli_exec("console dial 1002 at pickuptest")
+        if self.ast_version < AsteriskVersion("1.6.2"):
+            self.ast1.cli_exec("originate Local/1002 at pickuptest application echo")
+        else:
+            self.ast1.cli_exec("channel originate Local/1002 at pickuptest application echo")
 
     def launch_test1(self):
         self.log_last_step("Starting Test 1")
@@ -125,7 +126,10 @@
 
     def test2_pickup(self):
         self.log_last_step("Issuing the pickup")
-        self.ast1.cli_exec("console dial 1003 at pickuptest")
+        if self.ast_version < AsteriskVersion("1.6.2"):
+            self.ast1.cli_exec("originate Local/1003 at pickuptest application echo")
+        else:
+            self.ast1.cli_exec("channel originate Local/1003 at pickuptest application echo")
 
     def launch_test2(self):
         self.log_last_step("Starting Test 2")

Modified: asterisk/trunk/tests/directed_pickup/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/directed_pickup/test-config.yaml?view=diff&rev=1873&r1=1872&r2=1873
==============================================================================
--- asterisk/trunk/tests/directed_pickup/test-config.yaml (original)
+++ asterisk/trunk/tests/directed_pickup/test-config.yaml Fri Aug 19 11:56:26 2011
@@ -8,4 +8,3 @@
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
-        - custom : 'soundcard'