[asterisk-commits] pabelanger: branch pabelanger/autoload r876 - in /asterisk/team/pabelanger/au...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Nov 19 20:56:04 CST 2010 

Author: pabelanger
Date: Fri Nov 19 20:56:00 2010
New Revision: 876

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=876
Log:
Update test for autoload=no

Added:
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/ast1/
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/ast1/extensions.conf
      - copied unchanged from r875, asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/extensions.conf
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/ast1/features.conf
      - copied unchanged from r875, asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/features.conf
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/ast1/iax.conf
      - copied unchanged from r875, asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/iax.conf
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/ast2/
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/ast2/extensions.conf
      - copied unchanged from r875, asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs2/extensions.conf
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/ast2/iax.conf
      - copied unchanged from r875, asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs2/iax.conf
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/modules.conf.inc   (with props)
    asterisk/team/pabelanger/autoload/tests/configs/modules.conf   (with props)
    asterisk/team/pabelanger/autoload/tests/configs/modules.conf.inc   (with props)
Removed:
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/extensions.conf
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/features.conf
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/iax.conf
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs2/
Modified:
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/run-test

Added: asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/modules.conf.inc
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/modules.conf.inc?view=auto&rev=876
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/modules.conf.inc (added)
+++ asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/modules.conf.inc Fri Nov 19 20:56:00 2010
@@ -1,0 +1,4 @@
+
+load=>pbx_config.so
+
+load=>chan_iax2.so

Propchange: asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/modules.conf.inc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/modules.conf.inc
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/configs/modules.conf.inc
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/run-test?view=diff&rev=876&r1=875&r2=876
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/run-test Fri Nov 19 20:56:00 2010
@@ -19,6 +19,9 @@
 from asterisk.asterisk import Asterisk
 from asterisk.version import AsteriskVersion
 
+workingdir = "/tmp/asterisk-testsuite/blind-transfer-parkingtimeout"
+testdir = "tests/blind-transfer-parkingtimeout/configs/ast1"
+
 
 class BlindTransferTest:
     def __init__(self, argv):
@@ -31,8 +34,8 @@
 
         # get version info
         parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-         help="Asterisk version string")
+        parser.add_option("-v", "--version", dest="ast_version", help="Asterisk
+            version string")
         (options, args) = parser.parse_args(argv)
         self.ast_version = AsteriskVersion(options.ast_version)
 
@@ -42,16 +45,13 @@
 
         reactor.callWhenRunning(self.run)
 
-        print self.ast_version
-        self.asterisk1 = Asterisk(
-         base="/tmp/asterisk-testsuite/blind-transfer-parkingtimeout")
-        self.asterisk1.install_configs(
-         "tests/blind-transfer-parkingtimeout/configs")
+        self.ast1 = Asterisk(base=workingdir)
+        self.ast1.install_configs("%s/configs" % (testdir))
+        self.ast1.install_configs("%s/configs/ast1" % (testdir))
 
-        self.asterisk2 = Asterisk(
-         base="/tmp/asterisk-testsuite/blind-transfer-parkingtimeout")
-        self.asterisk2.install_configs(
-         "tests/blind-transfer-parkingtimeout/configs2")
+        self.ast2 = Asterisk(base=workingdir)
+        self.ast2.install_configs("%s/configs" % (testdir))
+        self.ast2.install_configs("%s/configs/ast2" % (testdir))
 
    # This gets invoked by the dialplan when test succeeds.
     def get_result_b(self, agi):
@@ -67,12 +67,12 @@
         self.log_last_step("Reading results")
 
         # get lock output in case of deadlock before tearing down.
-        self.asterisk1.cli_exec("core show locks")
-        self.asterisk2.cli_exec("core show locks")
+        self.ast1.cli_exec("core show locks")
+        self.ast2.cli_exec("core show locks")
 
         # if channels are still up for some reason, we want to know that
-        self.asterisk1.cli_exec("core show channels")
-        self.asterisk2.cli_exec("core show channels")
+        self.ast1.cli_exec("core show channels")
+        self.ast2.cli_exec("core show channels")
 
         if (self.passed):
             self.log_last_step("Test Passed...")
@@ -90,21 +90,21 @@
     # 3.  A gets parkingtimeout and returns to B
     # 4.  B reports results to FastAGI and hangup
     def launch_test(self):
-        self.asterisk2.cli_exec("core set verbose 10")
-        self.asterisk1.cli_exec("core set verbose 10")
+        self.ast1.cli_exec("core set verbose 10")
+        self.ast2.cli_exec("core set verbose 10")
 
         self.log_last_step("Originating call to begin test")
-        self.asterisk1.cli_originate(
-         "IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")
+        self.ast1.cli_originate("IAX2/userA at 127.0.0.1:4571/b_exten extension "
+            "a_dials at parking")
 
     def start_asterisk(self):
         self.log_last_step("Starting Asterisk")
-        self.asterisk1.start()
-        self.asterisk2.start()
+        self.ast1.start()
+        self.ast2.start()
 
     def stop_asterisk(self):
-        self.asterisk1.stop()
-        self.asterisk2.stop()
+        self.ast1.stop()
+        self.ast2.stop()
 
     def log_last_step(self, step):
         print step

Added: asterisk/team/pabelanger/autoload/tests/configs/modules.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/configs/modules.conf?view=auto&rev=876
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/configs/modules.conf (added)
+++ asterisk/team/pabelanger/autoload/tests/configs/modules.conf Fri Nov 19 20:56:00 2010
@@ -1,0 +1,4 @@
+[modules]
+autoload=no
+
+#include modules.conf.inc

Propchange: asterisk/team/pabelanger/autoload/tests/configs/modules.conf
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/team/pabelanger/autoload/tests/configs/modules.conf
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/team/pabelanger/autoload/tests/configs/modules.conf
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: asterisk/team/pabelanger/autoload/tests/configs/modules.conf.inc
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/configs/modules.conf.inc?view=auto&rev=876
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/configs/modules.conf.inc (added)
+++ asterisk/team/pabelanger/autoload/tests/configs/modules.conf.inc Fri Nov 19 20:56:00 2010
@@ -1,0 +1,1 @@
+; Do not delete.

Propchange: asterisk/team/pabelanger/autoload/tests/configs/modules.conf.inc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: asterisk/team/pabelanger/autoload/tests/configs/modules.conf.inc
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: asterisk/team/pabelanger/autoload/tests/configs/modules.conf.inc
------------------------------------------------------------------------------
    svn:mime-type = text/plain

More information about the asterisk-commits mailing list