[asterisk-commits] rmudgett: branch rmudgett/srtp r1676 - in /asterisk/team/rmudgett/srtp/tests/...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jun 23 18:45:54 2011
New Revision: 1676

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1676
Log:
Comments and definition reordering.

Modified:
    asterisk/team/rmudgett/srtp/tests/channels/SIP/noload_res_srtp/run-test
    asterisk/team/rmudgett/srtp/tests/channels/SIP/sip_srtp/run-test

Modified: asterisk/team/rmudgett/srtp/tests/channels/SIP/noload_res_srtp/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/srtp/tests/channels/SIP/noload_res_srtp/run-test?view=diff&rev=1676&r1=1675&r2=1676
==============================================================================
--- asterisk/team/rmudgett/srtp/tests/channels/SIP/noload_res_srtp/run-test (original)
+++ asterisk/team/rmudgett/srtp/tests/channels/SIP/noload_res_srtp/run-test Thu Jun 23 18:45:54 2011
@@ -28,11 +28,21 @@
         self.reactor_timeout = 10
 
         # Create one AGI server
+        # Will call fastagi_connect() once an AGI connection is established.
         self.create_fastagi_factory()
 
         # Create two Asterisk instances ...
         self.create_asterisk(2)
 
+    # This is called when the reactor has started running.
+    def run(self):
+        TestCase.run(self)
+
+        print "Initiating test call"
+        self.ast[0].cli_exec(
+            "originate SIP/2000/2000 extension 1000 at siptest1")
+
+    # This is called by each Asterisk instance if the call gets connected.
     def fastagi_connect(self, agi):
         def get_test_result(val):
             print "Connection result '%s'" % val
@@ -63,13 +73,6 @@
             print "Test passed"
             self.passed = True
 
-    def run(self):
-        TestCase.run(self)
-
-        print "Initiating test call"
-        self.ast[0].cli_exec(
-            "originate SIP/2000/2000 extension 1000 at siptest1")
-
 def main(argv=None):
     if argv is None:
         argv = sys.argv

Modified: asterisk/team/rmudgett/srtp/tests/channels/SIP/sip_srtp/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/srtp/tests/channels/SIP/sip_srtp/run-test?view=diff&rev=1676&r1=1675&r2=1676
==============================================================================
--- asterisk/team/rmudgett/srtp/tests/channels/SIP/sip_srtp/run-test (original)
+++ asterisk/team/rmudgett/srtp/tests/channels/SIP/sip_srtp/run-test Thu Jun 23 18:45:54 2011
@@ -28,11 +28,21 @@
         self.reactor_timeout = 10
 
         # Create one AGI server
+        # Will call fastagi_connect() once an AGI connection is established.
         self.create_fastagi_factory()
 
         # Create two Asterisk instances ...
         self.create_asterisk(2)
 
+    # This is called when the reactor has started running.
+    def run(self):
+        TestCase.run(self)
+
+        print "Initiating test call"
+        self.ast[0].cli_exec(
+            "originate SIP/2000/2000 extension 1000 at siptest1")
+
+    # This is called by each Asterisk instance if the call gets connected.
     def fastagi_connect(self, agi):
         def get_test_result(val):
             print "Connection result '%s'" % val
@@ -63,13 +73,6 @@
             print "Test passed"
             self.passed = True
 
-    def run(self):
-        TestCase.run(self)
-
-        print "Initiating test call"
-        self.ast[0].cli_exec(
-            "originate SIP/2000/2000 extension 1000 at siptest1")
-
 def main(argv=None):
     if argv is None:
         argv = sys.argv