[asterisk-commits] mjordan: testsuite/asterisk/trunk r3281 - in /asterisk/trunk/tests/channels/S...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sat Jun 23 14:52:50 2012
New Revision: 3281

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3281
Log:
Clean up custom_info test

The custom_info test had a lot of copy+paste errors in it.  This patch
cleans that up, and defers port management to the SIPpTest class, which
already manages simulatenous execution of SIPp scenarios.

Modified:
    asterisk/trunk/tests/channels/SIP/custom_info/configs/ast1/extensions.conf
    asterisk/trunk/tests/channels/SIP/custom_info/configs/ast1/sip.conf
    asterisk/trunk/tests/channels/SIP/custom_info/run-test
    asterisk/trunk/tests/channels/SIP/custom_info/test-config.yaml

Modified: asterisk/trunk/tests/channels/SIP/custom_info/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/custom_info/configs/ast1/extensions.conf?view=diff&rev=3281&r1=3280&r2=3281
==============================================================================
--- asterisk/trunk/tests/channels/SIP/custom_info/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/channels/SIP/custom_info/configs/ast1/extensions.conf Sat Jun 23 14:52:50 2012
@@ -3,8 +3,4 @@
 exten => test1,2,SIPSendCustomINFO(sent to everyone!)
 exten => test2,2,SIPSendCustomINFO(sent to certain UAs,specificUA)
 exten => _testX,3,Hangup()
-[default]
-exten => _testX,1,Answer()
-exten => test1,2,SIPSendCustomINFO(sent to everyone!)
-exten => test2,2,SIPSendCustomINFO(sent to certain UAs,specificUA)
-exten => _testX,3,Hangup()
+

Modified: asterisk/trunk/tests/channels/SIP/custom_info/configs/ast1/sip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/custom_info/configs/ast1/sip.conf?view=diff&rev=3281&r1=3280&r2=3281
==============================================================================
--- asterisk/trunk/tests/channels/SIP/custom_info/configs/ast1/sip.conf (original)
+++ asterisk/trunk/tests/channels/SIP/custom_info/configs/ast1/sip.conf Sat Jun 23 14:52:50 2012
@@ -1,2 +1,2 @@
 [general]
-[general]
+sipdebug = yes

Modified: asterisk/trunk/tests/channels/SIP/custom_info/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/custom_info/run-test?view=diff&rev=3281&r1=3280&r2=3281
==============================================================================
--- asterisk/trunk/tests/channels/SIP/custom_info/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/custom_info/run-test Sat Jun 23 14:52:50 2012
@@ -25,16 +25,8 @@
     {'scenario' : 'excluded_useragent.xml',},
 ]
 
-# set port numberings
-port = 5061
-def update_entry(entry):
-    global port
-    entry['-p'] = "%d" % port
-    port += 1
-
 # generate SIPP scenarios with appropriate port numbers and the config to go with it
 def main():
-    [update_entry(i) for i in SIPP_SCENARIOS]
     test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
     reactor.run()
     if not test.passed:
@@ -46,51 +38,3 @@
 if __name__ == "__main__":
     sys.exit(main())
 
-#!/usr/bin/env python
-'''
-Copyright (C) 2011, Digium, Inc.
-Kinsey Moore <kmoore at digium.com>
-
-This program is free software, distributed under the terms of
-the GNU General Public License Version 2.
-'''
-
-import sys
-import os
-
-sys.path.append("lib/python")
-
-from twisted.internet import reactor
-from asterisk.sipp import SIPpTest
-
-
-WORKING_DIR = "SIP/custom_info"
-TEST_DIR = os.path.dirname(os.path.realpath(__file__))
-
-SIPP_SCENARIOS = [
-    {'scenario' : 'send_all.xml',},
-    {'scenario' : 'selected_useragent.xml',},
-    {'scenario' : 'excluded_useragent.xml',},
-]
-
-# set port numberings
-port = 5061
-def update_entry(entry):
-    global port
-    entry['-p'] = "%d" % port
-    port += 1
-
-# generate SIPP scenarios with appropriate port numbers and the config to go with it
-def main():
-    [update_entry(i) for i in SIPP_SCENARIOS]
-    test = SIPpTest(WORKING_DIR, TEST_DIR, SIPP_SCENARIOS)
-    reactor.run()
-    if not test.passed:
-        return 1
-
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())
-

Modified: asterisk/trunk/tests/channels/SIP/custom_info/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/custom_info/test-config.yaml?view=diff&rev=3281&r1=3280&r2=3281
==============================================================================
--- asterisk/trunk/tests/channels/SIP/custom_info/test-config.yaml (original)
+++ asterisk/trunk/tests/channels/SIP/custom_info/test-config.yaml Sat Jun 23 14:52:50 2012
@@ -4,7 +4,9 @@
         'Ensure that custom SIP INFO messages are generated properly via AST_CONTROL_CUSTOM frames with AST_CUSTOM_SIP_INFO payload type.'
 
 properties:
-    minversion: '1.8.11-cert1'
+    minversion: '1.8.11.0'
+    features:
+      - 'digiumphones'
     dependencies:
         - app : 'sipp'
     tags: