[svn-commits] espiceland: testsuite/asterisk/trunk r712 - in /asterisk/trunk/tests/fastagi:...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Thu Aug 5 11:48:50 CDT 2010


Author: espiceland
Date: Thu Aug  5 11:48:46 2010
New Revision: 712

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=712
Log:
Updated descriptions, modified tests to use new install_configs() function.

Modified:
    asterisk/trunk/tests/fastagi/channel-status/run-test
    asterisk/trunk/tests/fastagi/channel-status/test-config.yaml
    asterisk/trunk/tests/fastagi/configs/extensions.conf
    asterisk/trunk/tests/fastagi/connect/run-test
    asterisk/trunk/tests/fastagi/connect/test-config.yaml
    asterisk/trunk/tests/fastagi/control-stream-file/run-test
    asterisk/trunk/tests/fastagi/control-stream-file/test-config.yaml
    asterisk/trunk/tests/fastagi/database/run-test
    asterisk/trunk/tests/fastagi/database/test-config.yaml
    asterisk/trunk/tests/fastagi/execute/run-test
    asterisk/trunk/tests/fastagi/execute/test-config.yaml
    asterisk/trunk/tests/fastagi/hangup/run-test
    asterisk/trunk/tests/fastagi/hangup/test-config.yaml
    asterisk/trunk/tests/fastagi/stream-file/run-test
    asterisk/trunk/tests/fastagi/stream-file/test-config.yaml

Modified: asterisk/trunk/tests/fastagi/channel-status/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/channel-status/run-test?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/channel-status/run-test (original)
+++ asterisk/trunk/tests/fastagi/channel-status/run-test Thu Aug  5 11:48:46 2010
@@ -36,9 +36,7 @@
 
         print self.ast_version
         self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/fastagi/channel-status")
-        self.asterisk.install_config("tests/fastagi/configs/extensions.conf")
-        self.asterisk.install_config("tests/fastagi/configs/manager.conf")
-        self.asterisk.install_config("tests/fastagi/configs/logger.conf")
+        self.asterisk.install_configs("tests/fastagi/configs")
 
     def on_answer_failure(self, reason):
         print 'Could not answer the call:', reason.getTraceback()
@@ -84,7 +82,7 @@
     def read_result(self):
         self.agi.finish()
         if self.passed[4] is True and self.passed[6] is True:
-            print "PASS - FastAGI channelStatus() works as expected."
+            print "PASS - FastAGI CHANNEL STATUS works as expected."
         else:
             self.asterisk.cli_exec("core show channels")
 
@@ -93,8 +91,8 @@
             else:
                 self.asterisk.cli_exec("dialplan show globals")
 
-            print "FAIL - View result of 'core show globals' in log for more\
-                detailed failure results."
+            print "FAIL - View result of 'core show globals' in log for",\
+                "more detailed failure results."
             if self.passed[4] is not True: print "Test 4 failed (ringing)."
             if self.passed[6] is not True: print "Test 6 failed (up)."
 

Modified: asterisk/trunk/tests/fastagi/channel-status/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/channel-status/test-config.yaml?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/channel-status/test-config.yaml (original)
+++ asterisk/trunk/tests/fastagi/channel-status/test-config.yaml Thu Aug  5 11:48:46 2010
@@ -1,9 +1,9 @@
 testinfo:
-    summary:     'Test FastAGI channelStatus() function.'
+    summary:     'Test AGI CHANNEL STATUS command using FastAGI.'
     description: |
-        "Test FastAGI channelStatus() function.  Note: This test also 
-        relies on FastAGI's answer() function, so this test can be considered 
-        a test for both functions."
+        "Test AGI CHANNEL STATUS command using FastAGI. Note: This test also 
+        relies on the ANSWER command, so this test can be considered 
+        a test for both commands."
 
 
 properties:

Modified: asterisk/trunk/tests/fastagi/configs/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/configs/extensions.conf?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/configs/extensions.conf (original)
+++ asterisk/trunk/tests/fastagi/configs/extensions.conf Thu Aug  5 11:48:46 2010
@@ -7,17 +7,22 @@
 exten => echo,1,Answer()
 exten => echo,n,Echo()
 
-; Used in connect, hangup, control-stream-file, stream-file, database, execute
+; Used in connect, hangup, control-stream-file, stream-file, database, execute, get-data
 exten => b_exten,1,Answer()
-exten => b_exten,n,Set(GLOBAL(DEBUG)=FAIL-before agi)
+exten => b_exten,n,Set(GLOBAL(DEBUG)=FAIL - before agi)
 exten => b_exten,n,AGI(agi://127.0.0.1:4573)
 exten => b_exten,n,Set(GLOBAL(DEBUG)=${AGISTATUS})
-exten => b_exten,n,Wait(10)
 exten => b_exten,n,HangUp()
 
 ; Used in channel-status
-exten => c_exten,1,Set(GLOBAL(DEBUG)=FAIL-before agi)
+exten => c_exten,1,Set(GLOBAL(DEBUG)=FAIL - before agi)
 exten => c_exten,n,AGI(agi://127.0.0.1:4573)
 exten => c_exten,n,Set(GLOBAL(DEBUG)=${AGISTATUS})
-exten => c_exten,n,Wait(10)
 exten => c_exten,n,HangUp()
+
+; Used in get-data
+exten => d_exten,1,Answer()
+exten => d_exten,n,Set(GLOBAL(DEBUG)=FAIL - d_exten answered)
+exten => d_exten,n,SendDTMF(w3w2w1w2w3w3w3w#)
+exten => d_exten,n,Set(GLOBAL(DEBUG)=FAIL - d_exten sent DTMF)
+exten => d_exten,n,HangUp()

Modified: asterisk/trunk/tests/fastagi/connect/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/connect/run-test?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/connect/run-test (original)
+++ asterisk/trunk/tests/fastagi/connect/run-test Thu Aug  5 11:48:46 2010
@@ -35,8 +35,7 @@
 
         print self.ast_version
         self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/fastagi/connect")
-        self.asterisk.install_config("tests/fastagi/configs/extensions.conf")
-        self.asterisk.install_config("tests/fastagi/configs/manager.conf")
+        self.asterisk.install_configs("tests/fastagi/configs")
 
     def on_failure(self, reason):
         print 'Could not run sequence to close connection.'

Modified: asterisk/trunk/tests/fastagi/connect/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/connect/test-config.yaml?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/connect/test-config.yaml (original)
+++ asterisk/trunk/tests/fastagi/connect/test-config.yaml Thu Aug  5 11:48:46 2010
@@ -1,7 +1,7 @@
 testinfo:
-    summary:     'Test FastAGI connection.'
+    summary:     'Test AGI connection using FastAGI.'
     description: |
-        'Test FastAGI connection.'
+        'Test AGI connection using FastAGI.'
 
 
 properties:

Modified: asterisk/trunk/tests/fastagi/control-stream-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/control-stream-file/run-test?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/control-stream-file/run-test (original)
+++ asterisk/trunk/tests/fastagi/control-stream-file/run-test Thu Aug  5 11:48:46 2010
@@ -35,12 +35,10 @@
 
         print self.ast_version
         self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/fastagi/control-stream-file")
-        self.asterisk.install_config("tests/fastagi/configs/extensions.conf")
-        self.asterisk.install_config("tests/fastagi/configs/manager.conf")
-        self.asterisk.install_config("tests/fastagi/configs/logger.conf")
+        self.asterisk.install_configs("tests/fastagi/configs")
 
     def on_failure(self, reason):
-        print 'Could not run controlStreamFile: ', reason.getTraceback()
+        print 'Could not run CONTROL STREAM FILE: ', reason.getTraceback()
         self.agi.finish()
 
     # result of 0 indicates success
@@ -62,7 +60,7 @@
     def read_result(self):
 
         if self.passed is True:
-            print "PASS - FastAGI controlStreamFile() works as expected."
+            print "PASS - FastAGI CONTROL STREAM FILE works as expected."
         else:
             self.asterisk.cli_exec("core show channels")
 
@@ -70,9 +68,9 @@
                 self.asterisk.cli_exec("core show globals")
             else:
                 self.asterisk.cli_exec("dialplan show globals")
-                print "FAIL - FastAGI Connection test failed. You may need to\
-                    update StarPy. Starpy 1.0.0a13 and older will always fail\
-                    this test."
+                print "FAIL - FastAGI CONTROL STREAM FILE test failed. You",\
+                    "may need to update StarPy. Starpy 1.0.0a13 and older",\
+                    "will always fail this test."
                 print "View result of 'core show globals' in log for more\
                     detailed failure results."
 

Modified: asterisk/trunk/tests/fastagi/control-stream-file/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/control-stream-file/test-config.yaml?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/control-stream-file/test-config.yaml (original)
+++ asterisk/trunk/tests/fastagi/control-stream-file/test-config.yaml Thu Aug  5 11:48:46 2010
@@ -1,9 +1,9 @@
 testinfo:
-    summary:     'Test FastAGI controlStreamFile().'
+    summary:     'Test AGI CONTROL STREAM FILE command using FastAGI.'
     description: |
-        "Test FastAGI controlStreamFile(). NOTE: If this test fails, you may
-        need to update StarPy.  Due to a bug, StarPy 1.0.0a13 and earlier
-        will always fail this test."
+        "Test AGI CONTROL STREAM FILE command using FastAGI. NOTE: If this
+        test fails, you may need to update StarPy.  Due to a bug, StarPy
+        1.0.0a13 and earlier will always fail this test."
 
 properties:
     minversion: '1.4'

Modified: asterisk/trunk/tests/fastagi/database/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/database/run-test?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/database/run-test (original)
+++ asterisk/trunk/tests/fastagi/database/run-test Thu Aug  5 11:48:46 2010
@@ -38,9 +38,7 @@
 
         print self.ast_version
         self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/fastagi/database")
-        self.asterisk.install_config("tests/fastagi/configs/extensions.conf")
-        self.asterisk.install_config("tests/fastagi/configs/manager.conf")
-        self.asterisk.install_config("tests/fastagi/configs/logger.conf")
+        self.asterisk.install_configs("tests/fastagi/configs")
 
     def on_del_failure(self, reason):
         print 'Could not delete the data from the database.'
@@ -73,7 +71,6 @@
 
     def get_result_from_put(self, result):
         self.passed["Put"] = True
-
         # 2. Retrieve that key from the database
         print "Retrieving key from the database."
         self.agi.databaseGet("secret",self.key).addCallback(
@@ -89,7 +86,7 @@
             # If the call to databaseGet() succeeds but the value is wrong,
             # the previous call to databasePut() failed.
             self.passed["Put"] = False
-            print "Call to databaseGet() succeeded, but value is wrong."
+            print "Call to DATABASE GET succeeded, but value is wrong."
             print 'Expected value of "juststarted" but got "%s"' % result
 
         # 3. Update the value of the key in the database
@@ -118,7 +115,7 @@
         print 'Value of %s is "%s"' % (self.key, result)
         if result != "halfwaydone":
             self.passed["Set"] = False
-            print "Call to databaseSet() succeeded,\
+            print "Call to DATABASE SET succeeded,\
                 but value did not get updated."
             print 'Expected value of "halfwaydone" but got "%s"' % result
 

Modified: asterisk/trunk/tests/fastagi/database/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/database/test-config.yaml?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/database/test-config.yaml (original)
+++ asterisk/trunk/tests/fastagi/database/test-config.yaml Thu Aug  5 11:48:46 2010
@@ -1,8 +1,8 @@
 testinfo:
-    summary:     'Test FastAGI database manipulation functions.'
+    summary:     'Test AGI DATABASE commands using FastAGI.'
     description: |
-        'Test FastAGI database manipulation functions. databasePut, databaseGet,
-        databaseSet, databaseDel.'
+        'Test AGI DATABASE commands using FastAGI, including DATABASE PUT,
+        DATABASE GET, and DATABASE DEL.'
 
 
 properties:

Modified: asterisk/trunk/tests/fastagi/execute/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/execute/run-test?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/execute/run-test (original)
+++ asterisk/trunk/tests/fastagi/execute/run-test Thu Aug  5 11:48:46 2010
@@ -43,9 +43,7 @@
 
         print self.ast_version
         self.asterisk=Asterisk(base="/tmp/asterisk-testsuite/fastagi/execute")
-        self.asterisk.install_config("tests/fastagi/configs/extensions.conf")
-        self.asterisk.install_config("tests/fastagi/configs/manager.conf")
-        self.asterisk.install_config("tests/fastagi/configs/logger.conf")
+        self.asterisk.install_configs("tests/fastagi/configs")
 
     def on_get_variable2_failure(self, reason):
         self.passed['Set [Channel]'] = False
@@ -82,7 +80,7 @@
 
     def on_get_variable_failure(self, reason):
         self.passed['Set [Global]'] = False
-        print 'Could not test value of global variable:', reason.getTraceback()
+        print 'Could not test value of global variable:',reason.getTraceback()
         self.do_Set2()
 
     def on_get_variable(self, result):
@@ -161,9 +159,9 @@
         self.agi.finish()
         for test in self.passed:
             if self.passed[test] is True:
-                print "execute %s worked as expected." % test
+                print "EXECUTE (%s) worked as expected." % test
             else:
-                print "execute %s FAILED." % test
+                print "EXECUTE (%s) FAILED." % test
                 self.overall_result = False
 
         self.stop_asterisk()

Modified: asterisk/trunk/tests/fastagi/execute/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/execute/test-config.yaml?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/execute/test-config.yaml (original)
+++ asterisk/trunk/tests/fastagi/execute/test-config.yaml Thu Aug  5 11:48:46 2010
@@ -1,7 +1,7 @@
 testinfo:
-    summary:     'Test FastAGI execute function.'
+    summary:     'Test AGI EXECUTE command using FastAGI.'
     description: |
-        'Test FastAGI execute function.'
+        'Test AGI EXECUTE command using FastAGI.'
 
 
 properties:

Modified: asterisk/trunk/tests/fastagi/hangup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/hangup/run-test?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/hangup/run-test (original)
+++ asterisk/trunk/tests/fastagi/hangup/run-test Thu Aug  5 11:48:46 2010
@@ -37,9 +37,7 @@
 
         print self.ast_version
         self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/fastagi/channel-status")
-        self.asterisk.install_config("tests/fastagi/configs/extensions.conf")
-        self.asterisk.install_config("tests/fastagi/configs/manager.conf")
-        self.asterisk.install_config("tests/fastagi/configs/logger.conf")
+        self.asterisk.install_configs("tests/fastagi/configs")
 
     def on_hangup_failure(self, reason):
         print 'Could not hangup:', reason.getTraceback()
@@ -91,7 +89,7 @@
     def read_result(self):
         self.agi.finish()
         if self.passed is True:
-            print "PASS - FastAGI hangup() works as expected."
+            print "PASS - FastAGI HANGUP works as expected."
         else:
             self.asterisk.cli_exec("core show channels")
 
@@ -100,8 +98,8 @@
             else:
                 self.asterisk.cli_exec("dialplan show globals")
 
-            print "FAIL - View result of 'core show globals' in log for more\
-                detailed failure results."
+            print "FAIL - View result of 'core show globals' in log for more",\
+                "detailed failure results."
 
         self.stop_asterisk()
 

Modified: asterisk/trunk/tests/fastagi/hangup/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/hangup/test-config.yaml?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/hangup/test-config.yaml (original)
+++ asterisk/trunk/tests/fastagi/hangup/test-config.yaml Thu Aug  5 11:48:46 2010
@@ -1,8 +1,8 @@
 testinfo:
-    summary:     'Test FastAGI hangup() function.'
+    summary:     'Test AGI HANGUP command using FastAGI.'
     description: |
-        'Test FastAGI hangup() function. Note: this test requires that
-        channelStatus() throw an error when it is asked to check the status
+        'Test AGI HANGUP command using FastAGI. Note: this test requires that
+        CHANNEL STATUS throw an error when it is asked to check the status
         of a dead channel.'
 
 

Modified: asterisk/trunk/tests/fastagi/stream-file/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/stream-file/run-test?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/stream-file/run-test (original)
+++ asterisk/trunk/tests/fastagi/stream-file/run-test Thu Aug  5 11:48:46 2010
@@ -35,9 +35,7 @@
 
         print self.ast_version
         self.asterisk = Asterisk(base="/tmp/asterisk-testsuite/fastagi/stream-file")
-        self.asterisk.install_config("tests/fastagi/configs/extensions.conf")
-        self.asterisk.install_config("tests/fastagi/configs/manager.conf")
-        self.asterisk.install_config("tests/fastagi/configs/logger.conf")
+        self.asterisk.install_configs("tests/fastagi/configs")
 
     def on_failure(self, reason):
         print 'Could not run streamFile: ', reason.getTraceback()
@@ -63,7 +61,7 @@
     def read_result(self):
 
         if self.passed is True:
-            print "PASS - FastAGI streamFile() works as expected."
+            print "PASS - FastAGI STREAM FILE works as expected."
         else:
             self.asterisk.cli_exec("core show channels")
 
@@ -71,8 +69,8 @@
                 self.asterisk.cli_exec("core show globals")
             else:
                 self.asterisk.cli_exec("dialplan show globals")
-                print "FAIL - FastAGI Connection test failed. View result of\
-                'core show globals' in log for more detailed failure results."
+                print "FAIL - FastAGI STREAM FILE test failed. View result of",\
+                "'core show globals' in log for more detailed failure results."
 
         self.stop_asterisk()
 

Modified: asterisk/trunk/tests/fastagi/stream-file/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fastagi/stream-file/test-config.yaml?view=diff&rev=712&r1=711&r2=712
==============================================================================
--- asterisk/trunk/tests/fastagi/stream-file/test-config.yaml (original)
+++ asterisk/trunk/tests/fastagi/stream-file/test-config.yaml Thu Aug  5 11:48:46 2010
@@ -1,7 +1,7 @@
 testinfo:
-    summary:     'Test FastAGI streamFile().'
+    summary:     'Test AGI STREAM FILE command using FastAGI.'
     description: |
-        "Test FastAGI streamFile()."
+        'Test AGI STREAM FILE command using FastAGI.'
 
 properties:
     minversion: '1.4'




More information about the svn-commits mailing list