[svn-commits] mjordan: branch mjordan/testsuite_refactor r2310 - in /asterisk/team/mjordan/...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri Sep 16 11:43:26 CDT 2011


Author: mjordan
Date: Fri Sep 16 11:43:22 2011
New Revision: 2310

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2310
Log:
Posted up to a branch

Added:
    asterisk/team/mjordan/testsuite_refactor/   (props changed)
      - copied from r2260, asterisk/trunk/
    asterisk/team/mjordan/testsuite_refactor/lib/python/asterisk/LockTestCondition.py
      - copied unchanged from r2271, asterisk/trunk/lib/python/asterisk/LockTestCondition.py
    asterisk/team/mjordan/testsuite_refactor/lib/python/asterisk/SipDialogTestCondition.py
      - copied unchanged from r2271, asterisk/trunk/lib/python/asterisk/SipDialogTestCondition.py
    asterisk/team/mjordan/testsuite_refactor/lib/python/asterisk/TestConditions.py
      - copied unchanged from r2271, asterisk/trunk/lib/python/asterisk/TestConditions.py
    asterisk/team/mjordan/testsuite_refactor/lib/python/asterisk/TestConfig.py
      - copied unchanged from r2271, asterisk/trunk/lib/python/asterisk/TestConfig.py
    asterisk/team/mjordan/testsuite_refactor/lib/python/asterisk/ThreadTestCondition.py
      - copied unchanged from r2271, asterisk/trunk/lib/python/asterisk/ThreadTestCondition.py
    asterisk/team/mjordan/testsuite_refactor/runtests.py
      - copied, changed from r2262, asterisk/trunk/runtests.py
    asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_attendant_exit/directory_attendant_exit.py
      - copied, changed from r2271, asterisk/trunk/tests/apps/directory_attendant_exit/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_context_operator_exit/directory_context_operator_exit.py
      - copied, changed from r2271, asterisk/trunk/tests/apps/directory_context_operator_exit/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_operator_exit/directory_operator_exit.py
      - copied, changed from r2271, asterisk/trunk/tests/apps/directory_operator_exit/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/authenticate_nominal/authenticate_nominal.py
      - copied, changed from r2260, asterisk/trunk/tests/apps/voicemail/authenticate_nominal/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/authenticate_nominal/test-config.yaml
      - copied unchanged from r2271, asterisk/trunk/tests/apps/voicemail/authenticate_nominal/test-config.yaml
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_new_user/check_voicemail_new_user.py
      - copied, changed from r2260, asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/extensions.conf
      - copied unchanged from r2271, asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/configs/ast2/extensions.conf
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml
      - copied unchanged from r2271, asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_nominal/check_voicemail_nominal.py
      - copied, changed from r2260, asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml
      - copied unchanged from r2271, asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/func_vmcount/func_vmcount.py
      - copied, changed from r2260, asterisk/trunk/tests/apps/voicemail/func_vmcount/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/func_vmcount/test-config.yaml
      - copied unchanged from r2271, asterisk/trunk/tests/apps/voicemail/func_vmcount/test-config.yaml
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/leave_voicemail_nominal/leave_voicemail_nominal.py
      - copied, changed from r2260, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml
      - copied unchanged from r2271, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml
    asterisk/team/mjordan/testsuite_refactor/tests/callparking/callparking.py
      - copied, changed from r2260, asterisk/trunk/tests/callparking/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/cdr/console_dial_sip_answer/console_dial_sip_answer.py
      - copied, changed from r2260, asterisk/trunk/tests/cdr/console_dial_sip_answer/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/noload_res_srtp/noload_res_srtp.py
      - copied, changed from r2260, asterisk/trunk/tests/channels/SIP/noload_res_srtp/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/noload_res_srtp_attempt_srtp/noload_res_srtp_attempt_srtp.py
      - copied, changed from r2260, asterisk/trunk/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/secure_bridge_media/secure_bridge_media.py
      - copied, changed from r2260, asterisk/trunk/tests/channels/SIP/secure_bridge_media/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/sip_options/
      - copied from r2260, asterisk/trunk/tests/channels/SIP/options/
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/sip_srtp/sip_srtp.py
      - copied, changed from r2260, asterisk/trunk/tests/channels/SIP/sip_srtp/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/sip_tls_call/sip_tls_call.py
      - copied, changed from r2260, asterisk/trunk/tests/channels/SIP/sip_tls_call/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/directed_pickup/directed_pickup.py
      - copied, changed from r2260, asterisk/trunk/tests/directed_pickup/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/dynamic_modules/
      - copied from r2260, asterisk/trunk/tests/dynamic-modules/
    asterisk/team/mjordan/testsuite_refactor/tests/dynamic_modules/dynamic_modules.py
      - copied, changed from r2260, asterisk/trunk/tests/dynamic-modules/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/channel_status/
      - copied from r2260, asterisk/trunk/tests/fastagi/channel-status/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/channel_status/channel_status.py
      - copied, changed from r2260, asterisk/trunk/tests/fastagi/channel-status/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/connect/connect.py
      - copied, changed from r2260, asterisk/trunk/tests/fastagi/connect/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/control_stream_file/
      - copied from r2260, asterisk/trunk/tests/fastagi/control-stream-file/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/control_stream_file/control_stream_file.py
      - copied, changed from r2260, asterisk/trunk/tests/fastagi/control-stream-file/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/database/database.py
      - copied, changed from r2260, asterisk/trunk/tests/fastagi/database/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/execute/execute.py
      - copied unchanged from r2260, asterisk/trunk/tests/fastagi/execute/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/get_data/
      - copied from r2260, asterisk/trunk/tests/fastagi/get-data/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/get_data/get_data.py
      - copied, changed from r2260, asterisk/trunk/tests/fastagi/get-data/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/hangup/hangup.py
      - copied unchanged from r2260, asterisk/trunk/tests/fastagi/hangup/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/record_file/
      - copied from r2260, asterisk/trunk/tests/fastagi/record-file/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/record_file/record_file.py
      - copied unchanged from r2260, asterisk/trunk/tests/fastagi/record-file/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_alpha/
      - copied from r2260, asterisk/trunk/tests/fastagi/say-alpha/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_alpha/say_alpha.py
      - copied unchanged from r2260, asterisk/trunk/tests/fastagi/say-alpha/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_date/
      - copied from r2260, asterisk/trunk/tests/fastagi/say-date/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_date/say_date.py
      - copied unchanged from r2260, asterisk/trunk/tests/fastagi/say-date/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_datetime/
      - copied from r2260, asterisk/trunk/tests/fastagi/say-datetime/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_datetime/say_datetime.py
      - copied unchanged from r2260, asterisk/trunk/tests/fastagi/say-datetime/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_digits/
      - copied from r2260, asterisk/trunk/tests/fastagi/say-digits/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_digits/say_digits.py
      - copied unchanged from r2260, asterisk/trunk/tests/fastagi/say-digits/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_number/
      - copied from r2260, asterisk/trunk/tests/fastagi/say-number/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_number/say_number.py
      - copied unchanged from r2260, asterisk/trunk/tests/fastagi/say-number/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_phonetic/
      - copied from r2260, asterisk/trunk/tests/fastagi/say-phonetic/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_phonetic/say_phonetic.py
      - copied unchanged from r2260, asterisk/trunk/tests/fastagi/say-phonetic/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_time/
      - copied from r2260, asterisk/trunk/tests/fastagi/say-time/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_time/say_time.py
      - copied unchanged from r2260, asterisk/trunk/tests/fastagi/say-time/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/stream_file/
      - copied from r2260, asterisk/trunk/tests/fastagi/stream-file/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/stream_file/stream_file.py
      - copied, changed from r2260, asterisk/trunk/tests/fastagi/stream-file/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/wait_for_digit/
      - copied from r2260, asterisk/trunk/tests/fastagi/wait-for-digit/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/wait_for_digit/wait_for_digit.py
      - copied unchanged from r2260, asterisk/trunk/tests/fastagi/wait-for-digit/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_g711_t38/gateway_g711_t38.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_g711_t38/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_mix1/gateway_mix1.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_mix1/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_mix2/gateway_mix2.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_mix2/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_mix3/gateway_mix3.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_mix3/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_mix4/gateway_mix4.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_mix4/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_native_t38/gateway_native_t38.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_native_t38/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_native_t38_ced/gateway_native_t38_ced.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_native_t38_ced/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_no_t38/gateway_no_t38.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_no_t38/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_t38_g711/gateway_t38_g711.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_t38_g711/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_timeout1/gateway_timeout1.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_timeout1/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_timeout2/gateway_timeout2.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_timeout2/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_timeout3/gateway_timeout3.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_timeout3/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_timeout4/gateway_timeout4.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_timeout4/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_timeout5/gateway_timeout5.py
      - copied, changed from r2260, asterisk/trunk/tests/fax/gateway_timeout5/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/manager/ami_login/
      - copied from r2260, asterisk/trunk/tests/manager/login/
    asterisk/team/mjordan/testsuite_refactor/tests/manager/ami_login/ami_login.py
      - copied, changed from r2260, asterisk/trunk/tests/manager/login/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/pbx/pbx_lua_background/pbx_lua_background.py
      - copied, changed from r2260, asterisk/trunk/tests/pbx/pbx_lua_background/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/pbx/pbx_lua_goto/pbx_lua_goto.py
      - copied, changed from r2260, asterisk/trunk/tests/pbx/pbx_lua_goto/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/pbx/pbx_merge_contexts/
      - copied from r2260, asterisk/trunk/tests/pbx/merge_contexts/
    asterisk/team/mjordan/testsuite_refactor/tests/pbx/pbx_merge_contexts/pbx_merge_contexts.py
      - copied, changed from r2260, asterisk/trunk/tests/pbx/merge_contexts/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/regressions/M18882/M18882.py
      - copied, changed from r2260, asterisk/trunk/tests/regressions/M18882/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/udptl/udptl.py
      - copied, changed from r2260, asterisk/trunk/tests/udptl/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/udptl_v6/udptl_v6.py
      - copied, changed from r2260, asterisk/trunk/tests/udptl_v6/run-test
Removed:
    asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_attendant_exit/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_context_operator_exit/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_operator_exit/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/authenticate_nominal/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_new_user/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_nominal/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/func_vmcount/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/leave_voicemail_nominal/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/callparking/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/cdr/console_dial_sip_answer/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/noload_res_srtp/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/options/
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/secure_bridge_media/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/sip_srtp/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/sip_tls_call/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/directed_pickup/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/dynamic-modules/
    asterisk/team/mjordan/testsuite_refactor/tests/dynamic_modules/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/channel-status/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/channel_status/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/connect/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/control-stream-file/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/control_stream_file/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/database/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/execute/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/get-data/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/get_data/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/hangup/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/record-file/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/record_file/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say-alpha/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say-date/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say-datetime/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say-digits/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say-number/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say-phonetic/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say-time/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_alpha/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_date/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_datetime/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_digits/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_number/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_phonetic/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/say_time/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/stream-file/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/stream_file/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/wait-for-digit/
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/wait_for_digit/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_g711_t38/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_mix1/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_mix2/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_mix3/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_mix4/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_native_t38/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_native_t38_ced/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_no_t38/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_t38_g711/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_timeout1/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_timeout2/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_timeout3/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_timeout4/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/fax/gateway_timeout5/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/manager/ami_login/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/manager/login/
    asterisk/team/mjordan/testsuite_refactor/tests/pbx/merge_contexts/
    asterisk/team/mjordan/testsuite_refactor/tests/pbx/pbx_lua_background/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/pbx/pbx_lua_goto/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/pbx/pbx_merge_contexts/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/regressions/M18882/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/udptl/run-test
    asterisk/team/mjordan/testsuite_refactor/tests/udptl_v6/run-test
Modified:
    asterisk/team/mjordan/testsuite_refactor/lib/python/asterisk/TestCase.py
    asterisk/team/mjordan/testsuite_refactor/tests/channels/SIP/tests.yaml
    asterisk/team/mjordan/testsuite_refactor/tests/fastagi/tests.yaml
    asterisk/team/mjordan/testsuite_refactor/tests/manager/tests.yaml
    asterisk/team/mjordan/testsuite_refactor/tests/pbx/tests.yaml
    asterisk/team/mjordan/testsuite_refactor/tests/tests.yaml

Propchange: asterisk/team/mjordan/testsuite_refactor/
------------------------------------------------------------------------------
    reviewboard:url = https://reviewboard.asterisk.org

Propchange: asterisk/team/mjordan/testsuite_refactor/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep 16 11:43:22 2011
@@ -1,0 +1,2 @@
+asterisk-test-suite-report.xml
+*.pyc

Propchange: asterisk/team/mjordan/testsuite_refactor/
------------------------------------------------------------------------------
    svn:mergeinfo = /asterisk/trunk:1112

Modified: asterisk/team/mjordan/testsuite_refactor/lib/python/asterisk/TestCase.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mjordan/testsuite_refactor/lib/python/asterisk/TestCase.py?view=diff&rev=2310&r1=2260&r2=2310
==============================================================================
--- asterisk/team/mjordan/testsuite_refactor/lib/python/asterisk/TestCase.py (original)
+++ asterisk/team/mjordan/testsuite_refactor/lib/python/asterisk/TestCase.py Fri Sep 16 11:43:22 2011
@@ -36,7 +36,12 @@
         classes.
         """
 
-        self.test_name = os.path.dirname(sys.argv[0])
+        """ Determine the type that inherited from this and the name of the module that contains it """
+        parts = str(type(self)).split('.')
+        module = parts[0][parts[0].find('\'')+1:]
+        m = __import__(module)
+        directory = m.__file__[:m.__file__.rfind("/")]
+        self.test_name = directory
         self.base = self.test_name.lstrip("tests/")
         self.ast = []
         self.ami = []
@@ -65,7 +70,8 @@
         self.__setup_conditions()
 
         logger.info("Executing " + self.test_name)
-        reactor.callWhenRunning(self.run)
+        self.__runId = reactor.addSystemEventTrigger('during', 'maintestbody', self.__run)
+        """ reactor.callWhenRunning(self.run) """
 
     def __setup_conditions(self):
         """
@@ -179,8 +185,8 @@
         Stop the reactor and cancel the test.
         """
         logger.info("Stopping Reactor")
-        if reactor.running:
-            reactor.stop()
+        #if reactor.running:
+        #    reactor.stop()
 
     def __reactor_timeout(self):
         '''
@@ -200,6 +206,21 @@
         if (self.reactor_timeout > 0):
             self.timeoutId = reactor.callLater(self.reactor_timeout, self.__reactor_timeout)
 
+    def __run(self):
+        logger.info("Starting main test body")
+        self.run()
+        reactor.removeSystemEventTrigger(self.__runId)
+
+    def check_results(self):
+        """
+        This method is called after test execution has completed and all Asterisk
+        instances have been stopped.  This allows for tests to check the results of the
+        test, internal values, etc. and set the final result of the test.
+
+        The base implementation does nothing and does not need to be called.
+        """
+        pass
+
     def ami_login_error(self, ami):
         """
         Handler for login errors into AMI.  This will stop the test.

Copied: asterisk/team/mjordan/testsuite_refactor/runtests.py (from r2262, asterisk/trunk/runtests.py)
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mjordan/testsuite_refactor/runtests.py?view=diff&rev=2310&p1=asterisk/trunk/runtests.py&r1=2262&p2=asterisk/team/mjordan/testsuite_refactor/runtests.py&r2=2310
==============================================================================
--- asterisk/trunk/runtests.py (original)
+++ asterisk/team/mjordan/testsuite_refactor/runtests.py Fri Sep 16 11:43:22 2011
@@ -18,6 +18,8 @@
 import shutil
 
 sys.path.append("lib/python")
+
+from twisted.internet import reactor
 
 from asterisk.version import AsteriskVersion
 from asterisk.asterisk import Asterisk
@@ -44,33 +46,61 @@
         self.passed = False
         self.did_run = True
         start_time = time.time()
-        cmd = [
-            "%s/run-test" % self.test_name,
-        ]
-
-        if os.path.exists(cmd[0]) and os.access(cmd[0], os.X_OK):
+        testresult = 1
+
+        try:
+            """ Append the location to the python path """
+            sys.path.append(self.test_name)
+            moduleName = self.test_name[self.test_name.rfind("/")+1:]
+            partName = "%s.%s" % (moduleName, moduleName)
+            parts = partName.split('.')
+            print self.test_name
+            print "Importing [%s]" % moduleName
+            m = __import__(moduleName, fromlist=[moduleName])
+            print m.__file__
+            print dir(m)
+            attr = m
+            while attr != None:
+                attr = getattr(m, moduleName, None)
+                if attr != None:
+                    print str(attr)
+                    m = attr
+            obj_instance = m()
+            obj_instance.start_asterisk()
+            if not reactor.running:
+                reactor.run()
+            reactor.fireSystemEvent('maintestbody')
+            obj_instance.stop_asterisk()
+            obj_instance.check_results()
+            if obj_instance.passed:
+                testresult = 0
+            sys.path.remove(self.test_name)
+        except Exception, e:
+            print "Failed to import module %s (%s), running as executable" % (self.test_name, str(e))
+            cmd = [
+                "%s/run-test" % self.test_name,
+            ]
             msg = "Running %s ..." % cmd
-            print msg
-            self.stdout += msg
-            p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
-                                 stderr=subprocess.STDOUT)
-            try:
-                for l in p.stdout.readlines():
-                    print l,
-                    self.stdout += l
-            except IOError:
-                pass
-            p.wait()
-
-            """ Parse out ERROR messages """
-            self.__parse_run_output(self.stdout)
-
-            self.passed = (p.returncode == 0 and self.test_config.expectPass) or (p.returncode and not self.test_config.expectPass)
-            if not self.passed:
-                self.__archive_ast_logs()
-
-        else:
-            print "FAILED TO EXECUTE %s, it must exist and be executable" % cmd
+            if os.path.exists(cmd[0]) and os.access(cmd[0], os.X_OK):        
+                self.stdout += msg
+                p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
+                                     stderr=subprocess.STDOUT)
+                try:
+                    for l in p.stdout.readlines():
+                        print l,
+                        self.stdout += l
+                except IOError:
+                    pass
+                p.wait()
+                testresult = p.returncode
+                """ Parse out ERROR messages """
+                self.__parse_run_output(self.stdout)
+            else:
+                print "FAILED TO EXECUTE %s, it must exist and be executable" % cmd
+
+        self.passed = (testresult == 0 and self.test_config.expectPass) or (testresult and not self.test_config.expectPass)
+        if not self.passed:
+            self.__archive_ast_logs()
         self.time = time.time() - start_time
 
     def __archive_ast_logs(self):

Copied: asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_attendant_exit/directory_attendant_exit.py (from r2271, asterisk/trunk/tests/apps/directory_attendant_exit/run-test)
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_attendant_exit/directory_attendant_exit.py?view=diff&rev=2310&p1=asterisk/trunk/tests/apps/directory_attendant_exit/run-test&r1=2271&p2=asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_attendant_exit/directory_attendant_exit.py&r2=2310
==============================================================================
--- asterisk/trunk/tests/apps/directory_attendant_exit/run-test (original)
+++ asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_attendant_exit/directory_attendant_exit.py Fri Sep 16 11:43:22 2011
@@ -19,7 +19,7 @@
 from asterisk.asterisk import Asterisk
 from asterisk.TestCase import TestCase
 
-class DirectoryTest(TestCase):
+class directory_attendant_exit(TestCase):
 
    def __init__(self):
       TestCase.__init__(self)
@@ -63,7 +63,7 @@
 
 
 def main():
-   test = DirectoryTest()
+   test = directory_attendant_exit()
    test.start_asterisk()
    reactor.run()
    test.stop_asterisk()

Copied: asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_context_operator_exit/directory_context_operator_exit.py (from r2271, asterisk/trunk/tests/apps/directory_context_operator_exit/run-test)
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_context_operator_exit/directory_context_operator_exit.py?view=diff&rev=2310&p1=asterisk/trunk/tests/apps/directory_context_operator_exit/run-test&r1=2271&p2=asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_context_operator_exit/directory_context_operator_exit.py&r2=2310
==============================================================================
--- asterisk/trunk/tests/apps/directory_context_operator_exit/run-test (original)
+++ asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_context_operator_exit/directory_context_operator_exit.py Fri Sep 16 11:43:22 2011
@@ -19,7 +19,7 @@
 from asterisk.asterisk import Asterisk
 from asterisk.TestCase import TestCase
 
-class DirectoryTest(TestCase):
+class directory_context_operator_exit(TestCase):
 
    def __init__(self):
       TestCase.__init__(self)
@@ -63,7 +63,7 @@
 
 
 def main():
-   test = DirectoryTest()
+   test = directory_context_operator_exit()
    test.start_asterisk()
    reactor.run()
    test.stop_asterisk()

Copied: asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_operator_exit/directory_operator_exit.py (from r2271, asterisk/trunk/tests/apps/directory_operator_exit/run-test)
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_operator_exit/directory_operator_exit.py?view=diff&rev=2310&p1=asterisk/trunk/tests/apps/directory_operator_exit/run-test&r1=2271&p2=asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_operator_exit/directory_operator_exit.py&r2=2310
==============================================================================
--- asterisk/trunk/tests/apps/directory_operator_exit/run-test (original)
+++ asterisk/team/mjordan/testsuite_refactor/tests/apps/directory_operator_exit/directory_operator_exit.py Fri Sep 16 11:43:22 2011
@@ -19,7 +19,7 @@
 from asterisk.asterisk import Asterisk
 from asterisk.TestCase import TestCase
 
-class DirectoryTest(TestCase):
+class directory_operator_exit(TestCase):
 
    def __init__(self):
       TestCase.__init__(self)
@@ -63,7 +63,7 @@
 
 
 def main():
-   test = DirectoryTest()
+   test = directory_operator_exit()
    test.start_asterisk()
    reactor.run()
    test.stop_asterisk()

Copied: asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/authenticate_nominal/authenticate_nominal.py (from r2260, asterisk/trunk/tests/apps/voicemail/authenticate_nominal/run-test)
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/authenticate_nominal/authenticate_nominal.py?view=diff&rev=2310&p1=asterisk/trunk/tests/apps/voicemail/authenticate_nominal/run-test&r1=2260&p2=asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/authenticate_nominal/authenticate_nominal.py&r2=2310
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/authenticate_nominal/run-test (original)
+++ asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/authenticate_nominal/authenticate_nominal.py Fri Sep 16 11:43:22 2011
@@ -21,7 +21,7 @@
 
 logger = logging.getLogger(__name__)
 
-class AuthenticateNominal(TestCase):
+class authenticate_nominal(TestCase):
 
     """ Each key value pair is the mailbox / password to test """
     credentials = [(9000, 1234), (9001, 0), (9002, 1234567890)]
@@ -30,7 +30,7 @@
     results = [False, False, False]
 
     def __init__(self):
-        super(AuthenticateNominal, self).__init__()
+        super(authenticate_nominal, self).__init__()
 
         self.reactor_timeout = 60
         self.senderAmi = None
@@ -88,17 +88,20 @@
                 self.stop_reactor()
 
             if self.testCounter < 3:
-                super(AuthenticateNominal, self).reset_timeout()
+                super(authenticate_nominal, self).reset_timeout()
                 self.executeTest(self.senderAmi)
 
     def run(self):
-        super(AuthenticateNominal, self).run()
+        super(authenticate_nominal, self).run()
         self.create_ami_factory(2)
 
+    def check_results(self):
+        for result in self.results:
+            self.passed = self.passed and result
 
 def main():
 
-    test = AuthenticateNominal()
+    test = authenticate_nominal()
     test.passed = True
 
     test.start_asterisk()

Copied: asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_new_user/check_voicemail_new_user.py (from r2260, asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/run-test)
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_new_user/check_voicemail_new_user.py?view=diff&rev=2310&p1=asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/run-test&r1=2260&p2=asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_new_user/check_voicemail_new_user.py&r2=2310
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_new_user/run-test (original)
+++ asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_new_user/check_voicemail_new_user.py Fri Sep 16 11:43:22 2011
@@ -31,7 +31,7 @@
 """
 TestState that is the entry point for the VoiceMailMain application
 """
-class StartVoiceMailState(VoiceMailState):
+class StartTestState(VoiceMailState):
 
     userMailbox = "1234#"
 
@@ -192,7 +192,7 @@
 """
 The TestCase class that executes the test
 """
-class CheckVoicemailNewUser(VoiceMailTest):
+class check_voicemail_new_user(VoiceMailTest):
 
     """
     The parent directory that this test resides in
@@ -210,7 +210,7 @@
     voicemailManager = None
 
     def __init__(self):
-        super(CheckVoicemailNewUser, self).__init__()
+        super(check_voicemail_new_user, self).__init__()
 
         """
         This merely passes back the value to the test condition, as all of our conditions
@@ -239,7 +239,7 @@
 
         self.createTestController()
         if (self.testStateController != None):
-            startObject = StartVoiceMailState(self.testStateController, self)
+            startObject = StartTestState(self.testStateController, self)
             self.testStateController.changeState(startObject)
             self.testStateController.addAssertHandler(self.handleAssert)
 
@@ -280,10 +280,29 @@
         super(CheckVoicemailNewUser, self).run()
         self.create_ami_factory(2)
 
+    def check_results(self):
+        voicemailManager = VoiceMailMailboxManagement(self.ast[0])
+        if self.passed:
+    
+            if not self.checkTestConditions():
+                logger.warn("Test failed condition checks")
+                self.passed = False
+    
+            """ Verify that we left all of the greetings """
+            formats = ["ulaw","wav","WAV"]
+            if not voicemailManager.checkGreetingExists("default","1234","greet",formats):
+                logger.warn("Failed to find greet greeting for 1234 at default")
+                self.passed = False
+            if not voicemailManager.checkGreetingExists("default","1234","busy",formats):
+                logger.warn("Failed to find busy greeting for 1234 at default")
+                self.passed = False
+            if not voicemailManager.checkGreetingExists("default","1234","unavail",formats):
+                logger.warn("Failed to find unavailable greeting for 1234 at default")
+                self.passed = False
 
 def main():
 
-    test = CheckVoicemailNewUser()
+    test = check_voicemail_new_user()
     voicemailManager = VoiceMailMailboxManagement(test.ast[0])
 
     test.start_asterisk()

Copied: asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_nominal/check_voicemail_nominal.py (from r2260, asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/run-test)
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_nominal/check_voicemail_nominal.py?view=diff&rev=2310&p1=asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/run-test&r1=2260&p2=asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_nominal/check_voicemail_nominal.py&r2=2310
==============================================================================
--- asterisk/trunk/tests/apps/voicemail/check_voicemail_nominal/run-test (original)
+++ asterisk/team/mjordan/testsuite_refactor/tests/apps/voicemail/check_voicemail_nominal/check_voicemail_nominal.py Fri Sep 16 11:43:22 2011
@@ -31,7 +31,7 @@
 """
 TestState that is the entry point for the VoiceMailMain application
 """
-class StartVoiceMailState(VoiceMailState):
+class StartTestState(VoiceMailState):
 
     userPassword = "1234#"
 
@@ -260,7 +260,7 @@
 """
 The TestCase class that executes the test
 """
-class CheckVoicemailNominal(VoiceMailTest):
+class check_voicemail_nominal(VoiceMailTest):
 
     """
     The channel to connect to that acts as the voicemail server
@@ -273,7 +273,7 @@
     voicemailManager = None
 
     def __init__(self):
-        super(CheckVoicemailNominal, self).__init__()
+        super(check_voicemail_nominal, self).__init__()
 
         """
         Add our test conditions to the test - these will help us verify through the
@@ -310,7 +310,7 @@
 
         self.createTestController()
         if (self.testStateController != None):
-            startObject = StartVoiceMailState(self.testStateController, self)
+            startObject = StartTestState(self.testStateController, self)
             self.testStateController.changeState(startObject)
             self.testStateController.addAssertHandler(self.handleAssert)
 
@@ -368,13 +368,33 @@
 
 
     def run(self):
-        super(CheckVoicemailNominal, self).run()
+        super(check_voicemail_nominal, self).run()
         self.create_ami_factory(2)
 
 
+    def check_results(self):
+        voicemailManager = VoiceMailMailboxManagement(self.ast[0])
+        if self.passed:
+    
+            if not self.checkTestConditions():

[... 1140 lines stripped ...]



More information about the svn-commits mailing list