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

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Nov 24 14:28:24 CST 2010


Author: pabelanger
Date: Wed Nov 24 14:28:19 2010
New Revision: 944

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=944
Log:
resync and automerge

Added:
    asterisk/team/pabelanger/autoload/configs/
      - copied from r938, asterisk/trunk/configs/
    asterisk/team/pabelanger/autoload/configs/asterisk.options.conf.inc
      - copied unchanged from r938, asterisk/trunk/configs/asterisk.options.conf.inc
    asterisk/team/pabelanger/autoload/configs/branch-1.4/
      - copied from r938, asterisk/trunk/configs/branch-1.4/
    asterisk/team/pabelanger/autoload/configs/branch-1.4/logger.conf
      - copied unchanged from r938, asterisk/trunk/configs/branch-1.4/logger.conf
    asterisk/team/pabelanger/autoload/configs/branch-1.6.2/
      - copied from r938, asterisk/trunk/configs/branch-1.6.2/
    asterisk/team/pabelanger/autoload/configs/branch-1.6.2/logger.conf
      - copied unchanged from r938, asterisk/trunk/configs/branch-1.6.2/logger.conf
    asterisk/team/pabelanger/autoload/configs/logger.conf
      - copied unchanged from r938, asterisk/trunk/configs/logger.conf
    asterisk/team/pabelanger/autoload/configs/logger.general.conf.inc
      - copied unchanged from r938, asterisk/trunk/configs/logger.general.conf.inc
    asterisk/team/pabelanger/autoload/configs/logger.logfiles.conf.inc
      - copied unchanged from r938, asterisk/trunk/configs/logger.logfiles.conf.inc
Removed:
    asterisk/team/pabelanger/autoload/tests/configs/
Modified:
    asterisk/team/pabelanger/autoload/   (props changed)
    asterisk/team/pabelanger/autoload/README.txt
    asterisk/team/pabelanger/autoload/lib/python/asterisk/asterisk.py
    asterisk/team/pabelanger/autoload/runtests.py
    asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/run-test
    asterisk/team/pabelanger/autoload/tests/callparking/run-test
    asterisk/team/pabelanger/autoload/tests/callparking_retrieval/   (props changed)
    asterisk/team/pabelanger/autoload/tests/cdr/console_fork_after_busy_forward/run-test
    asterisk/team/pabelanger/autoload/tests/directed_pickup/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/channel-status/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/connect/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/control-stream-file/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/database/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/execute/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/get-data/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/hangup/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/record-file/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/say-alpha/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/say-date/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/say-datetime/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/say-digits/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/say-number/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/say-phonetic/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/say-time/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/stream-file/run-test
    asterisk/team/pabelanger/autoload/tests/fastagi/wait-for-digit/run-test
    asterisk/team/pabelanger/autoload/tests/feature_attended_transfer/run-test
    asterisk/team/pabelanger/autoload/tests/feature_blonde_transfer/run-test
    asterisk/team/pabelanger/autoload/tests/iax2/basic-call/run-test
    asterisk/team/pabelanger/autoload/tests/manager/login/run-test
    asterisk/team/pabelanger/autoload/tests/mixmonitor/run-test
    asterisk/team/pabelanger/autoload/tests/mixmonitor_audiohook_inherit/run-test
    asterisk/team/pabelanger/autoload/tests/one-step-parking/run-test
    asterisk/team/pabelanger/autoload/tests/udptl/configs2/extensions.conf
    asterisk/team/pabelanger/autoload/tests/udptl/configs2/sip.conf
    asterisk/team/pabelanger/autoload/tests/udptl/test-config.yaml
    asterisk/team/pabelanger/autoload/tests/udptl_v6/configs2/extensions.conf
    asterisk/team/pabelanger/autoload/tests/udptl_v6/configs2/sip.conf
    asterisk/team/pabelanger/autoload/tests/udptl_v6/test-config.yaml

Propchange: asterisk/team/pabelanger/autoload/
------------------------------------------------------------------------------
    automerge = *

Propchange: asterisk/team/pabelanger/autoload/
------------------------------------------------------------------------------
    svn:mergeinfo = /asterisk/trunk:909-938

Propchange: asterisk/team/pabelanger/autoload/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov 24 14:28:19 2010
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-905
+/asterisk/trunk:1-905,909-938

Modified: asterisk/team/pabelanger/autoload/README.txt
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/README.txt?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/README.txt (original)
+++ asterisk/team/pabelanger/autoload/README.txt Wed Nov 24 14:28:19 2010
@@ -187,12 +187,26 @@
              -> run-test
              -> test-config.yaml
              ...
-
-        Finally, to have a test included in the test suite, it must be added to
-the "tests.yaml" file that lives in the tests directory.  This configuration
-file determines the order that the tests are considered for execution by the top
+        /configs
+          -> asterisk.options.conf.inc
+          -> logger.conf
+          -> logger.general.conf.inc
+          ...
+
+        To have a test included in the test suite, it must be added to the
+"tests.yaml" file that lives in the tests directory.  This configuration file
+determines the order that the tests are considered for execution by the top
 level test suite application.
 
+        The purpose of the 'configs' directory is to define global settings for
+Asterisk.  Tests will inherit these settings every time the testsuite creates
+sandbox instances of Asterisk.  Additionally, tests have the ability to override
+these setting, however it is NOT recommended they do so.  If you wanted to add a
+setting to logger.conf [logfiles], you could create a 'logger.logfiles.conf.inc'
+file for your test and the global Asterisk logger.conf will automatically
+include it. The filename convention is <asterisk module>.<category>.conf.inc.
+Again, settings in 'asterisk.options.conf.inc' would be included in
+asterisk.conf [options] category.
 
 b) Preconditions
 

Modified: asterisk/team/pabelanger/autoload/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/lib/python/asterisk/asterisk.py?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/lib/python/asterisk/asterisk.py (original)
+++ asterisk/team/pabelanger/autoload/lib/python/asterisk/asterisk.py Wed Nov 24 14:28:19 2010
@@ -100,7 +100,7 @@
         for (var, val) in dir_cat.options:
             self.__mirror_dir(var, val)
 
-        self.install_configs(os.getcwd() + "/tests/configs")
+        self.install_configs(os.getcwd() + "/configs")
 
     def start(self):
         """Start this instance of Asterisk.
@@ -349,17 +349,17 @@
             return
 
         for c in ast_conf.categories:
-            f.write("[%s]\n\n" % c.name)
+            f.write("[%s]\n" % c.name)
             if c.name == "directories":
                 for (var, val) in c.options:
                     self.directories[var] = val
                     f.write("%s = %s%s\n" % (var, self.base, val))
             elif c.name == "options":
+                f.write("#include \"%s/asterisk.options.conf.inc\"\n" %
+                        (self.astetcdir))
                 if ast_conf_options:
                     for (var, val) in ast_conf_options.iteritems():
                         f.write("%s = %s\n" % (var, val))
-                if not ast_conf_options or "nocolor" not in ast_conf_options:
-                    f.write("nocolor = yes\n")
                 for (var, val) in c.options:
                     if not ast_conf_options or var not in ast_conf_options:
                         f.write("%s = %s\n" % (var, val))

Modified: asterisk/team/pabelanger/autoload/runtests.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/runtests.py?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/runtests.py (original)
+++ asterisk/team/pabelanger/autoload/runtests.py Wed Nov 24 14:28:19 2010
@@ -295,13 +295,6 @@
             # XXX TODO Hard coded path, gross.
             os.system("rm -f /var/run/asterisk/asterisk.ctl")
             os.system("rm -f /var/run/asterisk/asterisk.pid")
-            os.chdir("..")
-            print "Uninstalling Asterisk ... "
-            os.system("make uninstall-all > /dev/null 2>&1")
-            print "Installing Asterisk ... "
-            os.system("make install > /dev/null 2>&1")
-            print "Installing sample configuration ... "
-            os.system("make samples > /dev/null 2>&1")
             os.chdir(test_suite_dir)
 
             # Run Test

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=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/blind-transfer-parkingtimeout/run-test Wed Nov 24 14:28:19 2010
@@ -90,9 +90,6 @@
     # 3.  A gets parkingtimeout and returns to B
     # 4.  B reports results to FastAGI and hangup
     def launch_test(self):
-        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.ast1.cli_originate("IAX2/userA at 127.0.0.1:4571/b_exten extension "
             "a_dials at parking")

Modified: asterisk/team/pabelanger/autoload/tests/callparking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/callparking/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/callparking/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/callparking/run-test Wed Nov 24 14:28:19 2010
@@ -138,10 +138,6 @@
     # 6.  userC dials 702 and retrieves userB
 
     def launch_test(self):
-        self.asterisk1.cli_exec("core set verbose 10")
-        self.asterisk2.cli_exec("core set verbose 10")
-        self.asterisk3.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 bridge_to_A at parking")

Propchange: asterisk/team/pabelanger/autoload/tests/callparking_retrieval/
            ('svn:mergeinfo' removed)

Modified: asterisk/team/pabelanger/autoload/tests/cdr/console_fork_after_busy_forward/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/cdr/console_fork_after_busy_forward/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/cdr/console_fork_after_busy_forward/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/cdr/console_fork_after_busy_forward/run-test Wed Nov 24 14:28:19 2010
@@ -60,6 +60,7 @@
     def end(self, ami, event):
         if event.get('channel').lower() != "console/dsp":
             return
+
         self.stop_asterisk()
         cdr1 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk1.base))
         cdr2 = AsteriskCSVCDR(fn="%s/var/log/asterisk/cdr-csv/Master.csv" % (self.asterisk2.base))
@@ -84,6 +85,11 @@
             dchannel="", lastapp="Hangup", lastarg="", disposition="ANSWERED",
             amaflags="DOCUMENTATION")])
 
+        if len(cdr1) < 2:
+            print "Fewer cdr records than expected! (%d)" % len(cdr1)
+            reactor.stop()
+            return
+
         if int(cdr1[0].duration) < int(cdr1[1].duration):
             print "Fail: Original CDR duration shorter than forked"
             sys.exit(-1)
@@ -105,3 +111,5 @@
 
 if __name__ == '__main__':
     sys.exit(main())
+
+# vim:sw=4:ts=4:expandtab:textwidth=79

Modified: asterisk/team/pabelanger/autoload/tests/directed_pickup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/directed_pickup/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/directed_pickup/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/directed_pickup/run-test Wed Nov 24 14:28:19 2010
@@ -118,7 +118,6 @@
 
     def launch_test1(self):
         self.log_last_step("Starting Test 1")
-        self.asterisk1.cli_exec("core set verbose 10")
         if self.ast_version < AsteriskVersion("1.6.2"):
             self.asterisk1.cli_exec("originate IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
         else:
@@ -137,7 +136,6 @@
             self.test2 = SKIP
             reactor.callLater(2, self.shut_down)
         else:
-            self.asterisk1.cli_exec("core set verbose 10")
             self.asterisk1.cli_exec("channel originate IAX2/iax_pickup_b at 127.0.0.1/waiting_exten extension 1001 at pickuptest")
             reactor.callLater(2, self.test2_pickup)
 

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/channel-status/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/channel-status/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/channel-status/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/channel-status/run-test Wed Nov 24 14:28:19 2010
@@ -103,7 +103,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         # Set blocking=False so that we can test channel

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/connect/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/connect/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/connect/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/connect/run-test Wed Nov 24 14:28:19 2010
@@ -69,8 +69,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
-
         print "Originating call to begin test."
         self.asterisk.cli_originate(
             "Local/basic_agi at agitest extension echo at agitest"

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/control-stream-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/control-stream-file/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/control-stream-file/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/control-stream-file/run-test Wed Nov 24 14:28:19 2010
@@ -81,7 +81,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/database/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/database/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/database/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/database/run-test Wed Nov 24 14:28:19 2010
@@ -184,7 +184,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/execute/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/execute/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/execute/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/execute/run-test Wed Nov 24 14:28:19 2010
@@ -170,7 +170,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
         print "Originating call to begin test."
         self.asterisk.cli_originate(

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/get-data/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/get-data/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/get-data/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/get-data/run-test Wed Nov 24 14:28:19 2010
@@ -89,7 +89,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/hangup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/hangup/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/hangup/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/hangup/run-test Wed Nov 24 14:28:19 2010
@@ -108,7 +108,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/record-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/record-file/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/record-file/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/record-file/run-test Wed Nov 24 14:28:19 2010
@@ -128,7 +128,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
         print "Originating call to begin test which terminates recording",\
             "with", self.test

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/say-alpha/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/say-alpha/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/say-alpha/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/say-alpha/run-test Wed Nov 24 14:28:19 2010
@@ -91,7 +91,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/say-date/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/say-date/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/say-date/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/say-date/run-test Wed Nov 24 14:28:19 2010
@@ -92,7 +92,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/say-datetime/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/say-datetime/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/say-datetime/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/say-datetime/run-test Wed Nov 24 14:28:19 2010
@@ -91,7 +91,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/say-digits/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/say-digits/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/say-digits/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/say-digits/run-test Wed Nov 24 14:28:19 2010
@@ -91,7 +91,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/say-number/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/say-number/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/say-number/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/say-number/run-test Wed Nov 24 14:28:19 2010
@@ -91,7 +91,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/say-phonetic/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/say-phonetic/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/say-phonetic/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/say-phonetic/run-test Wed Nov 24 14:28:19 2010
@@ -91,7 +91,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/say-time/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/say-time/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/say-time/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/say-time/run-test Wed Nov 24 14:28:19 2010
@@ -92,7 +92,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/stream-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/stream-file/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/stream-file/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/stream-file/run-test Wed Nov 24 14:28:19 2010
@@ -79,7 +79,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/fastagi/wait-for-digit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/fastagi/wait-for-digit/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/fastagi/wait-for-digit/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/fastagi/wait-for-digit/run-test Wed Nov 24 14:28:19 2010
@@ -85,7 +85,6 @@
             reactor.stop()
 
     def launch_test(self):
-        self.asterisk.cli_exec("core set verbose 10")
         self.asterisk.cli_exec("agi set debug on")
 
         print "Originating call to begin test."

Modified: asterisk/team/pabelanger/autoload/tests/feature_attended_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/feature_attended_transfer/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/feature_attended_transfer/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/feature_attended_transfer/run-test Wed Nov 24 14:28:19 2010
@@ -132,16 +132,12 @@
     # 7.  Audio and DTMF is passed and detected on each side of the call verifying the connection.
     # 8.  A and C report 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")
-
         if self.ast_version < AsteriskVersion("1.6.1"):
             self.asterisk1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
             self.asterisk2.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
         else:
             self.asterisk1.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
             self.asterisk2.cli_exec("dialplan set global TALK_AUDIO " + self.talkingaudio)
-
 
         self.log_last_step("Originating call to begin test 1")
         if self.ast_version < AsteriskVersion("1.6.2"):

Modified: asterisk/team/pabelanger/autoload/tests/feature_blonde_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/feature_blonde_transfer/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/feature_blonde_transfer/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/feature_blonde_transfer/run-test Wed Nov 24 14:28:19 2010
@@ -113,9 +113,6 @@
     # 6.  A and C report 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")
-
         if self.ast_version < AsteriskVersion("1.6.1"):
             self.asterisk1.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)
             self.asterisk2.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)

Modified: asterisk/team/pabelanger/autoload/tests/iax2/basic-call/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/iax2/basic-call/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/iax2/basic-call/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/iax2/basic-call/run-test Wed Nov 24 14:28:19 2010
@@ -29,7 +29,6 @@
         self.f = fastagi.FastAGIFactory(self.fastagi_func)
         reactor.listenTCP(4573, self.f, 50, '127.0.0.1')
         reactor.callWhenRunning(self.run)
-        reactor.callLater(20, self.stop_reactor)
 
         parser = OptionParser()
         parser.add_option("-v", "--version", dest="ast_version",
@@ -85,8 +84,7 @@
     def run(self):
         self.start_asterisk()
 
-        self.asterisk.cli_exec("core set verbose 10")
-        self.asterisk2.cli_exec("core set verbose 10")
+        reactor.callLater(20, self.stop_reactor)
 
         if self.ast_version < AsteriskVersion("1.6.0"):
             self.asterisk.cli_exec("iax2 set debug")

Modified: asterisk/team/pabelanger/autoload/tests/manager/login/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/manager/login/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/manager/login/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/manager/login/run-test Wed Nov 24 14:28:19 2010
@@ -28,12 +28,7 @@
         reactor.callWhenRunning(self.run)
 
         print "Creating Asterisk instance ..."
-        ast_conf_options = {
-            "verbose" : "10",
-            "debug" : "3"
-        }
-        self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/manager/login",
-                                 ast_conf_options=ast_conf_options)
+        self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/manager/login")
         self.asterisk.install_configs("tests/manager/login/configs")
 
     def stop_reactor(self):

Modified: asterisk/team/pabelanger/autoload/tests/mixmonitor/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/mixmonitor/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/mixmonitor/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/mixmonitor/run-test Wed Nov 24 14:28:19 2010
@@ -94,9 +94,6 @@
         self.log_last_step("Starting Asterisk")
         self.asterisk.start()
 
-        self.asterisk.cli_exec("core set verbose 10")
-        self.asterisk.cli_exec("core set debug 3")
-
         if self.ast_version < AsteriskVersion("1.6.1"):
             self.asterisk.cli_exec("core set global TESTAUDIO1 " + self.audiofile1)
             self.asterisk.cli_exec("core set global TESTAUDIO2 " + self.audiofile2)

Modified: asterisk/team/pabelanger/autoload/tests/mixmonitor_audiohook_inherit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/mixmonitor_audiohook_inherit/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/mixmonitor_audiohook_inherit/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/mixmonitor_audiohook_inherit/run-test Wed Nov 24 14:28:19 2010
@@ -69,8 +69,6 @@
         self.log_last_step("Starting Asterisk")
         self.asterisk.start()
 
-        self.asterisk.cli_exec("core set verbose 10")
-
         if self.ast_version < AsteriskVersion("1.6.1"):
             self.asterisk.cli_exec("core set global TESTAUDIO1 " + self.audiofile1)
             self.asterisk.cli_exec("core set global TALK_AUDIO " + self.talkingaudio)

Modified: asterisk/team/pabelanger/autoload/tests/one-step-parking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/one-step-parking/run-test?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/one-step-parking/run-test (original)
+++ asterisk/team/pabelanger/autoload/tests/one-step-parking/run-test Wed Nov 24 14:28:19 2010
@@ -103,9 +103,6 @@
     # 3.  A gets parked
     # 4.  B calls 701 and retrieves A
     def launch_test(self):
-        self.asterisk2.cli_exec("core set verbose 10")
-        self.asterisk1.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")

Modified: asterisk/team/pabelanger/autoload/tests/udptl/configs2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/udptl/configs2/extensions.conf?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/udptl/configs2/extensions.conf (original)
+++ asterisk/team/pabelanger/autoload/tests/udptl/configs2/extensions.conf Wed Nov 24 14:28:19 2010
@@ -1,4 +1,8 @@
 [facks]
-exten => 666,1,ReceiveFax(recv.tiff)
+exten => 666,1,Answer()
+exten => 666,n,Wait(20)
+exten => 666,n,Hangup()
+
+exten => fax,1,ReceiveFax(recv.tiff)
 
 exten => h,1,UserEvent(recvstatus, status: ${FAXSTATUS})

Modified: asterisk/team/pabelanger/autoload/tests/udptl/configs2/sip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/udptl/configs2/sip.conf?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/udptl/configs2/sip.conf (original)
+++ asterisk/team/pabelanger/autoload/tests/udptl/configs2/sip.conf Wed Nov 24 14:28:19 2010
@@ -2,6 +2,7 @@
 bindaddr = 0.0.0.0:5061
 t38pt_udptl = yes
 sipdebug = yes
+faxdetect = yes
 
 [sender]
 type = friend

Modified: asterisk/team/pabelanger/autoload/tests/udptl/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/udptl/test-config.yaml?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/udptl/test-config.yaml (original)
+++ asterisk/team/pabelanger/autoload/tests/udptl/test-config.yaml Wed Nov 24 14:28:19 2010
@@ -2,6 +2,8 @@
     summary:     'Test T.38 FAX transmission over SIP'
     description: |
         'One Asterisk instance sends a FAX to another Asterisk instance'
+    issues:
+        mantis : '18299'
 
 properties:
     minversion: '1.6.2'

Modified: asterisk/team/pabelanger/autoload/tests/udptl_v6/configs2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/udptl_v6/configs2/extensions.conf?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/udptl_v6/configs2/extensions.conf (original)
+++ asterisk/team/pabelanger/autoload/tests/udptl_v6/configs2/extensions.conf Wed Nov 24 14:28:19 2010
@@ -1,4 +1,8 @@
 [facks]
-exten => 666,1,ReceiveFax(recv.tiff)
+exten => 666,1,Answer()
+exten => 666,n,Wait(20)
+exten => 666,n,Hangup()
+
+exten => fax,1,ReceiveFax(recv.tiff)
 
 exten => h,1,UserEvent(recvstatus, status: ${FAXSTATUS})

Modified: asterisk/team/pabelanger/autoload/tests/udptl_v6/configs2/sip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/udptl_v6/configs2/sip.conf?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/udptl_v6/configs2/sip.conf (original)
+++ asterisk/team/pabelanger/autoload/tests/udptl_v6/configs2/sip.conf Wed Nov 24 14:28:19 2010
@@ -2,6 +2,7 @@
 bindaddr = [::1]:5061
 t38pt_udptl = yes
 sipdebug = yes
+faxdetect = yes
 
 [sender]
 type = friend

Modified: asterisk/team/pabelanger/autoload/tests/udptl_v6/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/autoload/tests/udptl_v6/test-config.yaml?view=diff&rev=944&r1=943&r2=944
==============================================================================
--- asterisk/team/pabelanger/autoload/tests/udptl_v6/test-config.yaml (original)
+++ asterisk/team/pabelanger/autoload/tests/udptl_v6/test-config.yaml Wed Nov 24 14:28:19 2010
@@ -3,6 +3,8 @@
     description: |
         'One Asterisk instance sends a FAX to another Asterisk instance.
          This test uses IPv6 addressing.'
+    issues:
+        - mantis : '18299'
 
 properties:
     minversion: '1.8'




More information about the asterisk-commits mailing list