[svn-commits] pabelanger: branch pabelanger/default_settings r1033 - in /asterisk/team/pabe...

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Wed Dec  1 12:45:21 2010
New Revision: 1033

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

Modified:
    asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test
    asterisk/team/pabelanger/default_settings/tests/fastagi/configs/ast1/extensions.conf
    asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test?view=diff&rev=1033&r1=1032&r2=1033
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/channel-status/run-test Wed Dec  1 12:45:21 2010
@@ -75,10 +75,7 @@
             print "Testing for channel status code 6."
 
         return self.get_deferred(agi).addCallback(
-            self.finish_test
-        ).addErrback(
-            self.on_failure
-        )
+            self.finish_test).addErrback(self.on_failure)
 
 	# Read test results and dialplan globals
     def read_result(self):
@@ -87,7 +84,6 @@
             print "PASS - FastAGI CHANNEL STATUS works as expected."
         else:
             self.ast1.cli_exec("core show channels")
-
             self.ast1.cli_exec("core show globals")
 
             print "FAIL - View result of 'core show globals' in log for",\
@@ -104,10 +100,8 @@
     def launch_test(self):
         self.ast1.cli_exec("agi set debug on")
 
-        # Set blocking=False so that we can test channel
-        # status before call is answered.
         print "Originating call to begin test."
-        self.ast1.cli_exec("originate Local/no_answer at agitest extension echo at agitest")
+        self.ast1.cli_exec("originate Local/no_answer at agitest extension echo at agitest", blocking=False)
 
     def start_asterisk(self):
         print "Starting Asterisk"
@@ -123,17 +117,17 @@
             reactor.callLater(2, self.read_result)
 
     def run(self):
-        self.start_asterisk()
-        reactor.callLater(2, self.launch_test)
+        self.launch_test()
         reactor.callLater(self.timeout, self.read_result)
 
 def main(argv=None):
     if argv is None:
         argv = sys.argv
 
-    agi_test = FastAGIChannelStatusTest(argv)
+    test = FastAGIChannelStatusTest(argv)
+    test.start_asterisk()
     reactor.run()
-    if agi_test.passed[4] is not True or agi_test.passed[6] is not True:
+    if test.passed[4] is not True or test.passed[6] is not True:
         return 1
 
     return 0

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/configs/ast1/extensions.conf?view=diff&rev=1033&r1=1032&r2=1033
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/configs/ast1/extensions.conf (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/configs/ast1/extensions.conf Wed Dec  1 12:45:21 2010
@@ -22,8 +22,6 @@
 exten => no_answer,n,AGI(agi://127.0.0.1:4573)
 exten => no_answer,n,Set(GLOBAL(DEBUG)=${AGISTATUS})
 exten => no_answer,n,HangUp()
-
-
 
 [get-data]
 exten => 1,1,Answer()

Modified: asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test?view=diff&rev=1033&r1=1032&r2=1033
==============================================================================
--- asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test (original)
+++ asterisk/team/pabelanger/default_settings/tests/fastagi/connect/run-test Wed Dec  1 12:45:21 2010
@@ -68,7 +68,7 @@
 
     def launch_test(self):
         print "Originating call to begin test."
-        self.ast1.cli_exec("orignate Local/501 at agitest extension echo at agitest")
+        self.ast1.cli_exec("originate Local/501 at agitest extension echo at agitest")
 
     def start_asterisk(self):
         print "Starting Asterisk"