[asterisk-commits] pabelanger: branch group/cdr_test_log_congestion r2030 - in /asterisk/team/gr...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Aug 30 09:58:43 CDT 2011


Author: pabelanger
Date: Tue Aug 30 09:58:37 2011
New Revision: 2030

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

Added:
    asterisk/team/group/cdr_test_log_congestion/configs/cli_aliases.conf
      - copied unchanged from r2023, asterisk/trunk/configs/cli_aliases.conf
    asterisk/team/group/cdr_test_log_congestion/contrib/
      - copied from r2023, asterisk/trunk/contrib/
    asterisk/team/group/cdr_test_log_congestion/contrib/testsuite-doxygen
      - copied unchanged from r2023, asterisk/trunk/contrib/testsuite-doxygen
    asterisk/team/group/cdr_test_log_congestion/doc/
      - copied from r2023, asterisk/trunk/doc/
    asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/voicemail.py
      - copied unchanged from r2023, asterisk/trunk/lib/python/asterisk/voicemail.py
    asterisk/team/group/cdr_test_log_congestion/logger.conf
      - copied unchanged from r2023, asterisk/trunk/logger.conf
    asterisk/team/group/cdr_test_log_congestion/logs/
      - copied from r2023, asterisk/trunk/logs/
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/
      - copied from r2023, asterisk/trunk/tests/apps/voicemail/
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/
      - copied from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/configs/
      - copied from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/configs/
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/
      - copied from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/extensions.conf
      - copied unchanged from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/sip.conf
      - copied unchanged from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/sip.conf
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/voicemail.conf
      - copied unchanged from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/voicemail.conf
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/
      - copied from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/extensions.conf
      - copied unchanged from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/sip.conf
      - copied unchanged from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/sip.conf
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/run-test
      - copied unchanged from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml
      - copied unchanged from r2023, asterisk/trunk/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/sounds/
      - copied from r2023, asterisk/trunk/tests/apps/voicemail/sounds/
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/sounds/talking.ulaw
      - copied unchanged from r2023, asterisk/trunk/tests/apps/voicemail/sounds/talking.ulaw
    asterisk/team/group/cdr_test_log_congestion/tests/apps/voicemail/tests.yaml
      - copied unchanged from r2023, asterisk/trunk/tests/apps/voicemail/tests.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/console_dial_sip_answer/configs/ast1/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/cdr/console_dial_sip_answer/configs/ast1/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/stream-file/configs/
      - copied from r2023, asterisk/trunk/tests/fastagi/stream-file/configs/
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/stream-file/configs/ast1/
      - copied from r2023, asterisk/trunk/tests/fastagi/stream-file/configs/ast1/
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/stream-file/configs/ast1/extensions.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fastagi/stream-file/configs/ast1/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/stream-file/configs/ast1/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/fastagi/stream-file/configs/ast1/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout3/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/configs/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout3/configs/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/configs/ast1/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout3/configs/ast1/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/configs/ast1/extensions.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout3/configs/ast1/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/configs/ast1/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout3/configs/ast1/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/configs/ast1/sip.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout3/configs/ast1/sip.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/configs/ast2/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout3/configs/ast2/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/configs/ast2/extensions.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout3/configs/ast2/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/configs/ast2/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout3/configs/ast2/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/configs/ast2/sip.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout3/configs/ast2/sip.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/run-test
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout3/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/send.tiff
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout3/send.tiff
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout3/test-config.yaml
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout3/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout4/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/configs/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout4/configs/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/configs/ast1/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout4/configs/ast1/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/configs/ast1/extensions.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout4/configs/ast1/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/configs/ast1/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout4/configs/ast1/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/configs/ast1/sip.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout4/configs/ast1/sip.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/configs/ast2/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout4/configs/ast2/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/configs/ast2/extensions.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout4/configs/ast2/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/configs/ast2/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout4/configs/ast2/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/configs/ast2/sip.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout4/configs/ast2/sip.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/run-test
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout4/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/send.tiff
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout4/send.tiff
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout4/test-config.yaml
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout4/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout5/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/configs/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout5/configs/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/configs/ast1/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout5/configs/ast1/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/configs/ast1/extensions.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout5/configs/ast1/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/configs/ast1/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout5/configs/ast1/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/configs/ast1/sip.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout5/configs/ast1/sip.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/configs/ast2/
      - copied from r2023, asterisk/trunk/tests/fax/gateway_timeout5/configs/ast2/
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/configs/ast2/extensions.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout5/configs/ast2/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/configs/ast2/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout5/configs/ast2/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/configs/ast2/sip.conf
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout5/configs/ast2/sip.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/run-test
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout5/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/send.tiff
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout5/send.tiff
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout5/test-config.yaml
      - copied unchanged from r2023, asterisk/trunk/tests/fax/gateway_timeout5/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/
      - copied from r2023, asterisk/trunk/tests/pbx/merge_contexts/
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/configs/
      - copied from r2023, asterisk/trunk/tests/pbx/merge_contexts/configs/
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/configs/ast1/
      - copied from r2023, asterisk/trunk/tests/pbx/merge_contexts/configs/ast1/
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/configs/ast1/extensions.conf
      - copied unchanged from r2023, asterisk/trunk/tests/pbx/merge_contexts/configs/ast1/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/configs/ast1/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/pbx/merge_contexts/configs/ast1/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/configs/ast1/sip.conf
      - copied unchanged from r2023, asterisk/trunk/tests/pbx/merge_contexts/configs/ast1/sip.conf
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/configs/ast2/
      - copied from r2023, asterisk/trunk/tests/pbx/merge_contexts/configs/ast2/
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/configs/ast2/extensions.ael
      - copied unchanged from r2023, asterisk/trunk/tests/pbx/merge_contexts/configs/ast2/extensions.ael
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/configs/ast2/extensions.conf
      - copied unchanged from r2023, asterisk/trunk/tests/pbx/merge_contexts/configs/ast2/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/configs/ast2/extensions.lua
      - copied unchanged from r2023, asterisk/trunk/tests/pbx/merge_contexts/configs/ast2/extensions.lua
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/configs/ast2/manager.general.conf.inc
      - copied unchanged from r2023, asterisk/trunk/tests/pbx/merge_contexts/configs/ast2/manager.general.conf.inc
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/configs/ast2/sip.conf
      - copied unchanged from r2023, asterisk/trunk/tests/pbx/merge_contexts/configs/ast2/sip.conf
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/run-test
      - copied unchanged from r2023, asterisk/trunk/tests/pbx/merge_contexts/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/merge_contexts/test-config.yaml
      - copied unchanged from r2023, asterisk/trunk/tests/pbx/merge_contexts/test-config.yaml
Removed:
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/console_dial_sip_answer/configs/ast1/manager.conf
Modified:
    asterisk/team/group/cdr_test_log_congestion/   (props changed)
    asterisk/team/group/cdr_test_log_congestion/Makefile
    asterisk/team/group/cdr_test_log_congestion/asttest/asttest.c
    asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/TestCase.py
    asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/ami.py
    asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/asterisk.py
    asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/cdr.py
    asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/config.py
    asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/sipp.py
    asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/version.py
    asterisk/team/group/cdr_test_log_congestion/lib/python/client.py
    asterisk/team/group/cdr_test_log_congestion/runtests.py
    asterisk/team/group/cdr_test_log_congestion/tests/apps/directory_attendant_exit/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/apps/directory_context_operator_exit/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/apps/directory_operator_exit/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/apps/tests.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/blind-transfer-parkingtimeout/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/callparking/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/cdr_unanswered_yes/configs/ast1/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/cdr_unanswered_yes/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/cdr_unanswered_yes/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/cdr_userfield/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/cdr_userfield/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/console_dial_sip_answer/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/console_dial_sip_answer/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/console_dial_sip_busy/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/console_dial_sip_congestion/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/console_dial_sip_transfer/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/console_fork_after_busy_forward/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/console_fork_before_dial/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/nocdr/configs/ast1/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/nocdr/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/cdr/nocdr/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/message_auth/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/message_disabled/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/message_from_call/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/message_unauth/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/noload_res_srtp/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/options/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/refer_replaces_to_self/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/secure_bridge_media/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/sip_attended_transfer/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/sip_attended_transfer_tcp/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/sip_attended_transfer_v6/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/sip_one_legged_transfer/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/sip_one_legged_transfer_v6/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/sip_register/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/sip_srtp/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/sip_tls_call/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/channels/SIP/sip_tls_call/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/chanspy/chanspy_barge/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/chanspy/chanspy_barge/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/chanspy/chanspy_w_mixmonitor/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/chanspy/chanspy_w_mixmonitor/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/directed_pickup/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/directed_pickup/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/dynamic-modules/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/channel-status/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/connect/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/control-stream-file/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/database/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/execute/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/get-data/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/hangup/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/record-file/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/say-alpha/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/say-date/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/say-datetime/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/say-digits/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/say-number/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/say-phonetic/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/say-time/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/stream-file/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fastagi/wait-for-digit/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_g711_t38/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_mix1/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_mix2/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_mix3/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_mix4/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_native_t38/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_native_t38_ced/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_no_t38/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_t38_g711/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout1/configs/ast2/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout1/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout2/configs/ast2/extensions.conf
    asterisk/team/group/cdr_test_log_congestion/tests/fax/gateway_timeout2/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/fax/tests.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/feature_attended_transfer/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/feature_blonde_transfer/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/func_srv/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/iax2/basic-call/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/manager/event-monitor/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/manager/login/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/mixmonitor/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/mixmonitor_audiohook_inherit/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/one-step-parking/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/call-files/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/pbx_lua_background/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/pbx_lua_background/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/pbx_lua_goto/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/pbx_lua_goto/test-config.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/pbx/tests.yaml
    asterisk/team/group/cdr_test_log_congestion/tests/queues/queue_baseline/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/queues/queue_baseline/test.lua
    asterisk/team/group/cdr_test_log_congestion/tests/regressions/M18882/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/udptl/run-test
    asterisk/team/group/cdr_test_log_congestion/tests/udptl_v6/run-test

Propchange: asterisk/team/group/cdr_test_log_congestion/
------------------------------------------------------------------------------
    automerge = *

Propchange: asterisk/team/group/cdr_test_log_congestion/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 30 09:58:37 2011
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-1822
+/asterisk/trunk:1-1822,1827-2023

Modified: asterisk/team/group/cdr_test_log_congestion/Makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/group/cdr_test_log_congestion/Makefile?view=diff&rev=2030&r1=2029&r2=2030
==============================================================================
--- asterisk/team/group/cdr_test_log_congestion/Makefile (original)
+++ asterisk/team/group/cdr_test_log_congestion/Makefile Tue Aug 30 09:58:37 2011
@@ -18,6 +18,7 @@
 
 distclean: _clean
 	make -C asttest distclean
+	rm -rf doc/api
 
 install:
 	make -C asttest install
@@ -29,3 +30,5 @@
 
 asttest:
 
+progdocs:
+	(cat contrib/testsuite-doxygen) | doxygen -

Modified: asterisk/team/group/cdr_test_log_congestion/asttest/asttest.c
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/group/cdr_test_log_congestion/asttest/asttest.c?view=diff&rev=2030&r1=2029&r2=2030
==============================================================================
--- asterisk/team/group/cdr_test_log_congestion/asttest/asttest.c (original)
+++ asterisk/team/group/cdr_test_log_congestion/asttest/asttest.c Tue Aug 30 09:58:37 2011
@@ -55,7 +55,6 @@
 		"  -v <version>   Specify the version of asterisk we are testing against.  If\n"
 		"                 not specified, the version.h file from the specified asterisk\n"
 		"                 path will be usedi to determine the version number.\n"
-		"  -n <name>      Reserved.\n"
 		"\n"
 		, prog_name, prog_name);
 }
@@ -83,7 +82,7 @@
 	opts->asterisk_path = "asterisk";
 
 	/* parse options */
-	while ((c = getopt(argc, argv, "l:a:s:v:n:wh")) != -1) {
+	while ((c = getopt(argc, argv, "l:a:s:v:wh")) != -1) {
 		switch (c) {
 		case 'l':
 			opts->log_filename = optarg;
@@ -93,9 +92,6 @@
 			break;
 		case 'a':
 			opts->asterisk_path = optarg;
-			break;
-		case 'n':
-			/* Reserved */
 			break;
 		case 's':
 			opts->single_test_mode = optarg;

Modified: asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/TestCase.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/TestCase.py?view=diff&rev=2030&r1=2029&r2=2030
==============================================================================
--- asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/TestCase.py (original)
+++ asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/TestCase.py Tue Aug 30 09:58:37 2011
@@ -8,14 +8,15 @@
 '''
 
 import sys
-import logging
-from optparse import OptionParser
+import logging, logging.config
+import logging.config
+import os
 from twisted.internet import reactor
 from starpy import manager, fastagi
 
 from asterisk import Asterisk
 
-log = logging.getLogger('TestCase')
+logger = logging.getLogger(__name__)
 
 class TestCase(object):
     ast = []
@@ -23,27 +24,24 @@
     fastagi = []
     reactor_timeout = 30
     passed = False
+    defaultLogLevel = "WARN"
+    defaultLogFileName = "logger.conf"
 
-    def __init__(self, argv):
-        """
+    def __init__(self):
+        self.test_name = os.path.dirname(sys.argv[0])
+        self.base = self.test_name.lstrip("tests/")
 
-        Keywork arguments:
-        argv --
+        self.testStateController = None
 
-        """
-        # get version info
-        parser = OptionParser()
-        parser.add_option("-v", "--version", dest="ast_version",
-                help="Asterisk version string")
-        parser.add_option("-n", dest="test_name",
-                help="Test name")
-        parser.add_option("--valgrind", action="store_true",
-                dest="valgrind", default=False,
-                help="Run Asterisk under valgrind.")
+        """ Set up logging """
+        logConfigFile = os.path.join(os.getcwd(), "%s" % (self.defaultLogFileName))
+        if os.path.exists(logConfigFile):
+            logging.config.fileConfig(logConfigFile, None, False)
+        else:
+            print "WARNING: no logging.conf file found; using default configuration"
+            logging.basicConfig(level=self.defaultLogLevel)
 
-        (self.options, args) = parser.parse_args(argv)
-        self.options.base = self.options.test_name.lstrip("tests/")
-
+        logger.info("Executing " + self.test_name)
         reactor.callWhenRunning(self.run)
 
     def create_asterisk(self, count=1):
@@ -54,15 +52,14 @@
 
         """
         for c in range(count):
-            print "Creating Asterisk instance %d ..." % (c + 1)
-            self.ast.append(Asterisk(base=self.options.base))
-            self.ast[c].valgrind = self.options.valgrind
+            logger.info("Creating Asterisk instance %d" % (c + 1))
+            self.ast.append(Asterisk(base=self.base))
             # Copy shared config files
             self.ast[c].install_configs("%s/configs" %
-                    (self.options.test_name))
+                    (self.test_name))
             # Copy test specific config files
             self.ast[c].install_configs("%s/configs/ast%d" %
-                    (self.options.test_name, c + 1))
+                    (self.test_name, c + 1))
 
     def create_ami_factory(self, count=1, username="user", secret="mysecret", port=5038):
         """
@@ -77,7 +74,7 @@
         for c in range(count):
             host = "127.0.0.%d" % (c + 1)
             self.ami.append(None)
-            print "Creating AMIFactory %d ..." % (c + 1)
+            logger.info("Creating AMIFactory %d" % (c + 1))
             self.ami_factory = manager.AMIFactory(username, secret, c)
             self.ami_factory.login(host).addCallbacks(self.ami_connect,
                     self.ami_login_error)
@@ -87,7 +84,7 @@
         for c in range(count):
             host = "127.0.0.%d" % (c + 1)
             self.fastagi.append(None)
-            print "Creating FastAGI Factory %d ..." % (c + 1)
+            logger.info("Creating FastAGI Factory %d" % (c + 1))
             self.fastagi_factory = fastagi.FastAGIFactory(self.fastagi_connect)
             reactor.listenTCP(4573, self.fastagi_factory,
                     self.reactor_timeout, host)
@@ -97,7 +94,7 @@
 
         """
         for index, item in enumerate(self.ast):
-            print "Starting Asterisk instance %d ..." % (index + 1)
+            logger.info("Starting Asterisk instance %d" % (index + 1))
             self.ast[index].start()
 
     def stop_asterisk(self):
@@ -105,14 +102,14 @@
 
         """
         for index, item in enumerate(self.ast):
-            print "Stopping Asterisk instance %d ..." % (index + 1)
+            logger.info("Stopping Asterisk instance %d" % (index + 1))
             self.ast[index].stop()
 
     def stop_reactor(self):
         """
 
         """
-        print "Stopping Reactor ..."
+        logger.info("Stopping Reactor")
         if reactor.running:
             reactor.stop()
 
@@ -123,10 +120,10 @@
         reactor.callLater(self.reactor_timeout, self.stop_reactor)
 
     def ami_login_error(self, ami):
-        print "Error logging into AMI"
+        logger.error("Error logging into AMI")
         self.stop_reactor()
 
     def ami_connect(self, ami):
-        print "AMI Connect instance %s ..." % (ami.id + 1)
+        logger.info("AMI Connect instance %s" % (ami.id + 1))
         self.ami[ami.id] = ami
 

Modified: asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/ami.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/ami.py?view=diff&rev=2030&r1=2029&r2=2030
==============================================================================
--- asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/ami.py (original)
+++ asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/ami.py Tue Aug 30 09:58:37 2011
@@ -2,6 +2,9 @@
 from starpy import manager
 import datetime
 import sys
+import logging
+
+logger = logging.getLogger(__name__)
 
 class AMI:
     def __init__(self, on_login, on_error, timeout=60, user="mark", secret="mysecret", host="127.0.0.1", port=5038):
@@ -18,20 +21,20 @@
 
     def login(self):
         self.__attempts = self.__attempts + 1
-        print "AMI Login attempt #%d" % (self.__attempts)
+        logger.debug("AMI Login attempt #%d" % (self.__attempts))
         if not self.__start:
             self.__start = datetime.datetime.now()
         self.ami_factory.login(self.host, self.port).addCallbacks(self.on_login_success, self.on_login_error)
 
     def on_login_success(self, ami):
         self.ami = ami
-        print "AMI Login succesful"
+        logger.debug("AMI Login succesful")
         return self.on_login(ami)
 
     def on_login_error(self, reason):
         runtime = (datetime.datetime.now() - self.__start).seconds
         if runtime >= self.login_timeout:
-            print "AMI login failed after %d second timeout" % (self.login_timeout)
+            logger.error("AMI login failed after %d second timeout" % (self.login_timeout))
             return self.on_error()
         delay = 2 ** self.__attempts
         if delay + runtime >= self.login_timeout:

Modified: asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/asterisk.py?view=diff&rev=2030&r1=2029&r2=2030
==============================================================================
--- asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/asterisk.py (original)
+++ asterisk/team/group/cdr_test_log_congestion/lib/python/asterisk/asterisk.py Tue Aug 30 09:58:37 2011
@@ -18,10 +18,12 @@
 import shutil
 import subprocess
 import utils
+import logging
 
 from config import ConfigFile
 from version import AsteriskVersion
 
+logger = logging.getLogger(__name__)
 
 class Asterisk:
     """An instance of Asterisk.
@@ -43,6 +45,10 @@
     asterisk.conf.
     """
 
+    """The base working directory of this instance of Asterisk
+    """
+    baseDirectory = ""
+
     def __init__(self, base=None, ast_conf_options=None, host="127.0.0.1"):
         """Construct an Asterisk instance.
 
@@ -61,7 +67,6 @@
         self.astetcdir = "/etc/asterisk"
         self.ast_binary = utils.which("asterisk") or "/usr/sbin/asterisk"
         self.host = host
-        self.valgrind = False
 
         # Find the system installed asterisk.conf
         ast_confs = [
@@ -74,7 +79,7 @@
                 ast_conf = ConfigFile(c)
                 break
         if ast_conf is None:
-            print "No asterisk.conf found on the system!"
+            logger.error("No asterisk.conf found on the system!")
             return
 
         if base is not None:
@@ -86,6 +91,7 @@
                 break
             i += 1
         os.makedirs(self.base)
+        self.baseDirectory = self.base
 
         # Mirror system install directory structure
         dir_cat = None
@@ -93,7 +99,7 @@
             if c.name == "directories":
                 dir_cat = c
         if dir_cat is None:
-            print "Unable to discover dir layout from asterisk.conf"
+            logger.error("Unable to discover dir layout from asterisk.conf")
             return
         self.__gen_ast_conf(ast_conf, dir_cat, ast_conf_options)
         for (var, val) in dir_cat.options:
@@ -114,12 +120,10 @@
             "-f", "-g", "-q", "-m", "-n",
             "-C", "%s" % os.path.join(self.astetcdir, "asterisk.conf")
         ]
-        if self.valgrind:
-            cmd.insert(0, "valgrind")
         try:
             self.process = subprocess.Popen(cmd)
         except OSError:
-            print "Failed to execute command: %s" % str(cmd)
+            logger.error("Failed to execute command: %s" % str(cmd))
             return False
 
         # Be _really_ sure that Asterisk has started up before returning.
@@ -230,7 +234,7 @@
         asterisk.install_config("tests/my-cool-test/configs/manager.conf")
         """
         if not os.path.exists(cfg_path):
-            print "Config file '%s' does not exist" % cfg_path
+            logger.error("Config file '%s' does not exist" % cfg_path)
             return
 
         tmp = "%s/%s/%s" % (os.path.dirname(cfg_path), self.ast_version.branch, os.path.basename(cfg_path))
@@ -242,9 +246,9 @@
         try:
             shutil.copyfile(cfg_path, target_path)
         except shutil.Error:
-            print "'%s' and '%s' are the same file" % (cfg_path, target_path)
+            logger.warn("'%s' and '%s' are the same file" % (cfg_path, target_path))
         except IOError:
-            print "The destination is not writable '%s'" % target_path
+            logger.warn("The destination is not writable '%s'" % target_path)
 
     def cli_originate(self, argstr, blocking=True):
         """Starts a call from the CLI and links it to an application or
@@ -270,13 +274,13 @@
         raise_error = False
         if len(args) != 3 and len(args) != 4:
             raise_error = True
-            print "Wrong number of arguments."
+            logger.error("Wrong number of arguments.")
         if args[1] != "extension" and args[1] != "application":
             raise_error = True
-            print '2nd argument must be "extension" or "application"'
+            logger.error('2nd argument must be "extension" or "application"')
         if args[0].find("/") == -1:
             raise_error = True
-            print 'Channel dial string must be in the form "tech/data".'
+            logger.error('Channel dial string must be in the form "tech/data".')
         if raise_error is True:
             raise Exception, "Cannot originate call!\n\
             Argument string must be in one of these forms:\n\
@@ -304,7 +308,7 @@
             "-C", "%s" % os.path.join(self.astetcdir, "asterisk.conf"),
             "-rx", "%s" % cli_cmd
         ]
-        print "Executing %s ..." % cmd
+        logger.debug("Executing %s ..." % cmd)
 
         if not blocking:
             process = subprocess.Popen(cmd)
@@ -314,13 +318,13 @@
             process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                        stderr=subprocess.STDOUT)
         except OSError:
-            print "Failed to execute command: %s" % str(cmd)
+            logger.warn("Failed to execute command: %s" % str(cmd))
             return ""
 
         output = ""
         try:
             for l in process.stdout.readlines():
-                print l,

[... 4562 lines stripped ...]



More information about the asterisk-commits mailing list