[asterisk-commits] pabelanger: branch pabelanger/SWP-2718 r1311 - in /asterisk/team/pabelanger/S...

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Mon Jan  3 10:08:24 2011
New Revision: 1311

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1311
Log:
Merged revisions 1305 via svnmerge from 
https://origsvn.digium.com/svn/testsuite/asterisk/trunk

........
  r1305 | pabelanger | 2010-12-28 14:31:14 -0500 (Tue, 28 Dec 2010) | 2 lines
  
  Rework chanspy_barge test
........

Modified:
    asterisk/team/pabelanger/SWP-2718/   (props changed)
    asterisk/team/pabelanger/SWP-2718/tests/chanspy/chanspy_barge/run-test
    asterisk/team/pabelanger/SWP-2718/tests/chanspy/chanspy_barge/test-config.yaml

Propchange: asterisk/team/pabelanger/SWP-2718/
------------------------------------------------------------------------------
    automerge = *

Propchange: asterisk/team/pabelanger/SWP-2718/
------------------------------------------------------------------------------
    svn:mergeinfo = /asterisk/trunk:1305

Propchange: asterisk/team/pabelanger/SWP-2718/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan  3 10:08:24 2011
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-1301
+/asterisk/trunk:1-1301,1305

Modified: asterisk/team/pabelanger/SWP-2718/tests/chanspy/chanspy_barge/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/SWP-2718/tests/chanspy/chanspy_barge/run-test?view=diff&rev=1311&r1=1310&r2=1311
==============================================================================
--- asterisk/team/pabelanger/SWP-2718/tests/chanspy/chanspy_barge/run-test (original)
+++ asterisk/team/pabelanger/SWP-2718/tests/chanspy/chanspy_barge/run-test Mon Jan  3 10:08:24 2011
@@ -76,7 +76,7 @@
             reactor.callLater(4, self.bHangup)
         print event
 
-    def ami_connect1(self, ami):
+    def amiOnConnect(self, ami):
         self.logLastStep("Connected to the AMI")
         self.ami = ami
         self.ami.registerEvent('ChanSpyStart', self.chanspyEvent)
@@ -87,10 +87,25 @@
 
     def amiLogin(self):
         self.logLastStep("Logging in to the AMI")
-        self.ami_factory1 = manager.AMIFactory("user", "mysecret")
-        self.ami_factory2 = manager.AMIFactory("user", "mysecret")
-        self.ami_factory1.login('127.0.0.1', 5038).addCallbacks(self.ami_connect1 self.amiLoginError)
-#        self.ami_factory2.login('127.0.0.2', 5038).addCallbacks(self.ami_connect2 self.amiLoginError)
+        self.ami_factory = manager.AMIFactory("user", "mysecret")
+        self.ami_factory.login('127.0.0.1', 5038).addCallbacks(self.amiOnConnect, self.amiLoginError)
+
+    def aCall(self):
+        self.logLastStep("A Calling into Wait")
+        self.pja.stdin.write("m\n")
+        self.pja.stdin.write("sip:play_exten at 127.0.0.1:5060\n")
+
+    def bCall(self):
+        self.logLastStep("B Calling into Playback")
+        self.pjb.stdin.write("m\n")
+        self.pjb.stdin.write("sip:play_exten at 127.0.0.1:5060\n")
+
+    def aHangup(self):
+        self.pja.stdin.write("h\n")
+
+    def bHangup(self): #calls into chanspy extension and plays audio to A using Barge
+        self.pjb.stdin.write("h\n")
+        reactor.callLater(2, self.verifyAudio)
 
     def start_asterisk(self):
         self.logLastStep("Starting Processes")
@@ -134,7 +149,7 @@
 
     # Run Test
     test = ChanSpyBarge(argv)
-    test.start_asterisk()
+    test.startProcesses()
     reactor.run()
     test.stop_asterisk()
     if test.passed != True:

Modified: asterisk/team/pabelanger/SWP-2718/tests/chanspy/chanspy_barge/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/SWP-2718/tests/chanspy/chanspy_barge/test-config.yaml?view=diff&rev=1311&r1=1310&r2=1311
==============================================================================
--- asterisk/team/pabelanger/SWP-2718/tests/chanspy/chanspy_barge/test-config.yaml (original)
+++ asterisk/team/pabelanger/SWP-2718/tests/chanspy/chanspy_barge/test-config.yaml Mon Jan  3 10:08:24 2011
@@ -15,3 +15,5 @@
     dependencies:
         - python : 'twisted'
         - python : 'starpy'
+        - app : 'pjsua'
+        - custom : 'soundcard'