[asterisk-commits] pabelanger: branch pabelanger/localhostBindaddr r973 - in /asterisk/team/pabe...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Nov 26 18:08:17 CST 2010


Author: pabelanger
Date: Fri Nov 26 18:08:14 2010
New Revision: 973

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=973
Log:
Fix various typos.

Modified:
    asterisk/team/pabelanger/localhostBindaddr/tests/blind-transfer-parkingtimeout/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/callparking/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_unanswered_yes/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_userfield/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/cdr/nocdr/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/directed_pickup/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/iax2/basic-call/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/mixmonitor/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/mixmonitor_audiohook_inherit/run-test
    asterisk/team/pabelanger/localhostBindaddr/tests/pbx/call-files/run-test

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/blind-transfer-parkingtimeout/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/blind-transfer-parkingtimeout/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/blind-transfer-parkingtimeout/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/blind-transfer-parkingtimeout/run-test Fri Nov 26 18:08:14 2010
@@ -44,10 +44,10 @@
 
         reactor.callWhenRunning(self.run)
 
-        self.ast1 = Asterisk(base=workingDir)
+        self.ast1 = Asterisk(base=workingdir)
         self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
-        self.ast2 = Asterisk(base=workingDir)
+        self.ast2 = Asterisk(base=workingdir)
         self.ast2.install_configs("%s/configs/ast2" % (testdir))
 
    # This gets invoked by the dialplan when test succeeds.

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/callparking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/callparking/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/callparking/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/callparking/run-test Fri Nov 26 18:08:14 2010
@@ -38,7 +38,6 @@
          help="Asterisk version string")
         (options, args) = parser.parse_args(argv)
         self.ast_version = AsteriskVersion(options.ast_version)
-        print self.ast_version
 
         # FastAGI, listen for results from dialplan
         self.agi_b = fastagi.FastAGIFactory(self.get_result_b)
@@ -48,11 +47,11 @@
         reactor.listenTCP(4575, self.agi_c, self.timeout, '127.0.0.1')
 
         self.agi_retrieve_A = fastagi.FastAGIFactory(
-          self.get_result_retrieve_A)
+            self.get_result_retrieve_A)
         reactor.listenTCP(4576, self.agi_retrieve_A, self.timeout, '127.0.0.1')
 
         self.agi_retrieve_B = fastagi.FastAGIFactory(
-         self.get_result_retrieve_B)
+            self.get_result_retrieve_B)
         reactor.listenTCP(4577, self.agi_retrieve_B, self.timeout, '127.0.0.1')
 
         reactor.callWhenRunning(self.run)

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_unanswered_yes/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_unanswered_yes/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_unanswered_yes/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_unanswered_yes/run-test Fri Nov 26 18:08:14 2010
@@ -27,7 +27,7 @@
         reactor.callLater(60, self.abort)
 
         ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs" % (testdir))
+        ast1.install_configs("%s/configs/ast1" % (testdir))
 
         ast1.start()
         self.ast1 = ast1

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_userfield/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_userfield/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_userfield/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/cdr_userfield/run-test Fri Nov 26 18:08:14 2010
@@ -27,7 +27,7 @@
         reactor.callLater(60, self.abort)
 
         ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs" % (testdir))
+        ast1.install_configs("%s/configs/ast1" % (testdir))
 
         ast1.start()
 

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_answer/run-test Fri Nov 26 18:08:14 2010
@@ -27,10 +27,10 @@
         reactor.callLater(60, self.abort)
 
         ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs1" % (testdir))
+        ast1.install_configs("%s/configs/ast1" % (testdir))
 
         ast2 = Asterisk(base=workingdir)
-        ast2.install_configs("%s/configs2" % (testdir))
+        ast2.install_configs("%s/configs/ast2" % (testdir))
 
         ast1.start()
         ast2.start()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_busy/run-test Fri Nov 26 18:08:14 2010
@@ -27,10 +27,10 @@
         reactor.callLater(60, self.abort)
 
         ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs1" % (testdir))
+        ast1.install_configs("%s/configs/ast1" % (testdir))
 
         ast2 = Asterisk(base=workingdir)
-        ast2.install_configs("%s/configs2" % (testdir))
+        ast2.install_configs("%s/configs/ast2" % (testdir))
 
         ast1.start()
         ast2.start()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_congestion/run-test Fri Nov 26 18:08:14 2010
@@ -27,10 +27,10 @@
         reactor.callLater(60, self.abort)
 
         ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs1" % (testdir))
+        ast1.install_configs("%s/configs/ast1" % (testdir))
 
         ast2 = Asterisk(base=workingdir)
-        ast2.install_configs("%s/configs2" % (testdir))
+        ast2.install_configs("%s/configs/ast2" % (testdir))
 
         ast1.start()
         ast2.start()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_dial_sip_transfer/run-test Fri Nov 26 18:08:14 2010
@@ -27,10 +27,10 @@
         reactor.callLater(60, self.abort)
 
         ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs1" % (testdir))
+        ast1.install_configs("%s/configs/ast1" % (testdir))
 
-        asterisk2 = Asterisk(base=workingdir)
-        asterisk2.install_configs("%s/configs2" % (testdir))
+        ast2 = Asterisk(base=workingdir)
+        ast2.install_configs("%s/configs/ast2" % (testdir))
 
         ast1.start()
         ast2.start()
@@ -46,7 +46,7 @@
 
     def stop_asterisk(self):
         self.ast1.stop()
-        self.asterisk2.stop()
+        self.ast2.stop()
 
     def abort(self):
         print "Aborting ..."

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_after_busy_forward/run-test Fri Nov 26 18:08:14 2010
@@ -27,10 +27,10 @@
         reactor.callLater(60, self.abort)
 
         ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs1" % (testdir))
+        ast1.install_configs("%s/configs/ast1" % (testdir))
 
         ast2 = Asterisk(base=workingdir)
-        ast2.install_configs("%s/configs2" % (testdir))
+        ast2.install_configs("%s/configs/ast2" % (testdir))
 
         ast1.start()
         ast2.start()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/console_fork_before_dial/run-test Fri Nov 26 18:08:14 2010
@@ -27,10 +27,10 @@
         reactor.callLater(60, self.abort)
 
         ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs1" % (testdir))
+        ast1.install_configs("%s/configs/ast1" % (testdir))
 
         ast2 = Asterisk(base=workingdir)
-        ast2.install_configs("%s/configs2" % (testdir))
+        ast2.install_configs("%s/configs/ast2" % (testdir))
 
         ast1.start()
         ast2.start()

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/cdr/nocdr/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/cdr/nocdr/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/cdr/nocdr/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/cdr/nocdr/run-test Fri Nov 26 18:08:14 2010
@@ -27,7 +27,7 @@
         reactor.callLater(60, self.abort)
 
         ast1 = Asterisk(base=workingdir)
-        ast1.install_configs("%s/configs" % (testdir))
+        ast1.install_configs("%s/configs/ast1" % (testdir))
 
         ast1.start()
 

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/directed_pickup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/directed_pickup/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/directed_pickup/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/directed_pickup/run-test Fri Nov 26 18:08:14 2010
@@ -54,7 +54,7 @@
         reactor.callWhenRunning(self.run)
 
         print self.ast_version
-        self.ast1 = Asterisk(base=workingdir))
+        self.ast1 = Asterisk(base=workingdir)
         self.ast1.install_configs("%s/configs" % (testdir))
 
     def shut_down(self):

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/iax2/basic-call/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/iax2/basic-call/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/iax2/basic-call/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/iax2/basic-call/run-test Fri Nov 26 18:08:14 2010
@@ -42,10 +42,10 @@
         print "Creating Asterisk instances ..."
 
         self.ast1 = Asterisk(base=workingdir)
-        self.ast1.install_configs("%s/configs/ast1")
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
         self.ast2 = Asterisk(base=workingdir)
-        self.ast2.install_configs("%s/configs/ast2")
+        self.ast2.install_configs("%s/configs/ast2" % (testdir))
 
     def fastagi_func(self, agi):
         sequence = fastagi.InSequence()
@@ -75,7 +75,7 @@
         self.ast1.stop()
         self.ast2.stop()
         cdr = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" %
-                self.asterisk2.base)
+                self.ast2.base)
         cdr_test = AsteriskCSVCDR(
                 records=[AsteriskCSVCDRLine(disposition="ANSWERED", dchannel="",
                 dcontext="iaxtest", amaflags="DOCUMENTATION", accountcode="",

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/mixmonitor/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/mixmonitor/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/mixmonitor/run-test Fri Nov 26 18:08:14 2010
@@ -42,12 +42,12 @@
 
         print self.ast_version
         self.ast1 = Asterisk(base=workingdir)
-        self.ast1.install_configs("%s/configs/ast1")
-        self.audiofile1 = os.path.join(os.getcwd(), "tests/mixmonitor/testaudio1")
-        self.audiofile2 = os.path.join(os.getcwd(), "tests/mixmonitor/testaudio2")
-        self.audiofile3 = os.path.join(os.getcwd(), "tests/mixmonitor/testaudio3")
+        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))
 
-        self.talkingaudio = os.path.join(os.getcwd(), "tests/mixmonitor/sounds/talking")
+        self.talkingaudio = os.path.join(os.getcwd(), "%s/sounds/talking" % (testdir))
 
     def read_result(self):
         self.log_last_step("Reading result file from MixMonitor")

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/mixmonitor_audiohook_inherit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/mixmonitor_audiohook_inherit/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/mixmonitor_audiohook_inherit/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/mixmonitor_audiohook_inherit/run-test Fri Nov 26 18:08:14 2010
@@ -38,7 +38,7 @@
         reactor.callWhenRunning(self.run)
 
         print self.ast_version
-        self.ast1 = Asterisk(base="workingdir")
+        self.ast1 = Asterisk(base=workingdir)
         self.ast1.install_configs("%s/configs/ast1" % (testdir))
         self.audiofile1 = os.path.join(os.getcwd(), "%s/testaudio1" % (testdir))
         self.talkingaudio = os.path.join(os.getcwd(), "%s/sounds/talking" % (testdir))

Modified: asterisk/team/pabelanger/localhostBindaddr/tests/pbx/call-files/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/localhostBindaddr/tests/pbx/call-files/run-test?view=diff&rev=973&r1=972&r2=973
==============================================================================
--- asterisk/team/pabelanger/localhostBindaddr/tests/pbx/call-files/run-test (original)
+++ asterisk/team/pabelanger/localhostBindaddr/tests/pbx/call-files/run-test Fri Nov 26 18:08:14 2010
@@ -74,7 +74,7 @@
         for i in [ "", "2" ]:
             print "Moving the sample%s.call file to the spool dir..." % (i)
 
-            copy("%s/sample%s.call" % (TESTDIR, i),
+            copy("%s/sample%s.call" % (testdir, i),
                  "%s/etc/sample%s.call" % (self.ast1.base, i))
 
             move("%s/etc/sample%s.call" % (self.ast1.base, i),




More information about the asterisk-commits mailing list