[asterisk-commits] pabelanger: branch pabelanger/dynamic-modules r828 - in /asterisk/team/pabela...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Nov 12 09:58:34 CST 2010
Author: pabelanger
Date: Fri Nov 12 09:58:25 2010
New Revision: 828
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=828
Log:
Reset branch and automerge.
Added:
asterisk/team/pabelanger/dynamic-modules/asttest/self-tests/test_skip/tests/.hidden_skip/
- copied from r826, asterisk/trunk/asttest/self-tests/test_skip/tests/.hidden_skip/
asterisk/team/pabelanger/dynamic-modules/asttest/self-tests/test_skip/tests/.hidden_skip/test.lua
- copied unchanged from r826, asterisk/trunk/asttest/self-tests/test_skip/tests/.hidden_skip/test.lua
asterisk/team/pabelanger/dynamic-modules/asttest/self-tests/test_skip/tests/_auto_skip/
- copied from r826, asterisk/trunk/asttest/self-tests/test_skip/tests/_auto_skip/
asterisk/team/pabelanger/dynamic-modules/asttest/self-tests/test_skip/tests/_auto_skip/test.lua
- copied unchanged from r826, asterisk/trunk/asttest/self-tests/test_skip/tests/_auto_skip/test.lua
asterisk/team/pabelanger/dynamic-modules/lib/sh/library.sh
- copied unchanged from r826, asterisk/trunk/lib/sh/library.sh
asterisk/team/pabelanger/dynamic-modules/tests/callparking/
- copied from r826, asterisk/trunk/tests/callparking/
asterisk/team/pabelanger/dynamic-modules/tests/callparking/configs/
- copied from r826, asterisk/trunk/tests/callparking/configs/
asterisk/team/pabelanger/dynamic-modules/tests/callparking/configs/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking/configs/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking/configs/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking/configs/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking/configs2/
- copied from r826, asterisk/trunk/tests/callparking/configs2/
asterisk/team/pabelanger/dynamic-modules/tests/callparking/configs2/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking/configs2/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking/configs2/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking/configs2/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking/configs3/
- copied from r826, asterisk/trunk/tests/callparking/configs3/
asterisk/team/pabelanger/dynamic-modules/tests/callparking/configs3/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking/configs3/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking/configs3/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking/configs3/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking/run-test
- copied unchanged from r826, asterisk/trunk/tests/callparking/run-test
asterisk/team/pabelanger/dynamic-modules/tests/callparking/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/callparking/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/ (props changed)
- copied from r826, asterisk/trunk/tests/callparking_retrieval/
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/run-test
- copied unchanged from r826, asterisk/trunk/tests/callparking_retrieval/run-test
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/callparking_retrieval/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/userA/
- copied from r826, asterisk/trunk/tests/callparking_retrieval/userA/
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/userA/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking_retrieval/userA/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/userA/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking_retrieval/userA/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/userB/
- copied from r826, asterisk/trunk/tests/callparking_retrieval/userB/
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/userB/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking_retrieval/userB/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/userB/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking_retrieval/userB/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/userC/
- copied from r826, asterisk/trunk/tests/callparking_retrieval/userC/
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/userC/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking_retrieval/userC/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/userC/features.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking_retrieval/userC/features.conf
asterisk/team/pabelanger/dynamic-modules/tests/callparking_retrieval/userC/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/callparking_retrieval/userC/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_answer/configs1/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_dial_sip_answer/configs1/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_answer/configs1/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_dial_sip_answer/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_answer/configs2/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_dial_sip_answer/configs2/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_answer/configs2/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_dial_sip_answer/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_busy/configs1/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_dial_sip_busy/configs1/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_busy/configs1/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_dial_sip_busy/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_busy/configs2/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_dial_sip_busy/configs2/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_busy/configs2/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_dial_sip_busy/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_congestion/configs1/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs1/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_congestion/configs1/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_congestion/configs2/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs2/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_congestion/configs2/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_transfer/configs1/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs1/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_transfer/configs1/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_transfer/configs2/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs2/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_transfer/configs2/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_after_busy_forward/configs1/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs1/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_after_busy_forward/configs1/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_after_busy_forward/configs2/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs2/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_after_busy_forward/configs2/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_before_dial/configs1/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_fork_before_dial/configs1/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_before_dial/configs1/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_fork_before_dial/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_before_dial/configs2/branch-1.4/
- copied from r826, asterisk/trunk/tests/cdr/console_fork_before_dial/configs2/branch-1.4/
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_before_dial/configs2/branch-1.4/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/cdr/console_fork_before_dial/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/execute/
- copied from r826, asterisk/trunk/tests/fastagi/execute/
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/execute/run-test
- copied unchanged from r826, asterisk/trunk/tests/fastagi/execute/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/execute/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/fastagi/execute/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/get-data/
- copied from r826, asterisk/trunk/tests/fastagi/get-data/
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/get-data/run-test
- copied unchanged from r826, asterisk/trunk/tests/fastagi/get-data/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/get-data/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/fastagi/get-data/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/record-file/
- copied from r826, asterisk/trunk/tests/fastagi/record-file/
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/record-file/run-test
- copied unchanged from r826, asterisk/trunk/tests/fastagi/record-file/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/record-file/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/fastagi/record-file/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-alpha/
- copied from r826, asterisk/trunk/tests/fastagi/say-alpha/
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-alpha/run-test
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-alpha/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-alpha/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-alpha/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-date/
- copied from r826, asterisk/trunk/tests/fastagi/say-date/
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-date/run-test
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-date/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-date/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-date/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-datetime/
- copied from r826, asterisk/trunk/tests/fastagi/say-datetime/
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-datetime/run-test
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-datetime/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-datetime/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-datetime/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-digits/
- copied from r826, asterisk/trunk/tests/fastagi/say-digits/
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-digits/run-test
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-digits/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-digits/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-digits/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-number/
- copied from r826, asterisk/trunk/tests/fastagi/say-number/
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-number/run-test
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-number/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-number/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-number/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-phonetic/
- copied from r826, asterisk/trunk/tests/fastagi/say-phonetic/
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-phonetic/run-test
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-phonetic/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-phonetic/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-phonetic/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-time/
- copied from r826, asterisk/trunk/tests/fastagi/say-time/
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-time/run-test
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-time/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/say-time/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/fastagi/say-time/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/iax2/
- copied from r826, asterisk/trunk/tests/iax2/
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/ (props changed)
- copied from r826, asterisk/trunk/tests/iax2/basic-call/
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/configs/
- copied from r826, asterisk/trunk/tests/iax2/basic-call/configs/
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/configs/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/iax2/basic-call/configs/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/configs/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/iax2/basic-call/configs/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/configs/logger.conf
- copied unchanged from r826, asterisk/trunk/tests/iax2/basic-call/configs/logger.conf
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/configs/manager.conf
- copied unchanged from r826, asterisk/trunk/tests/iax2/basic-call/configs/manager.conf
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/configs2/
- copied from r826, asterisk/trunk/tests/iax2/basic-call/configs2/
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/configs2/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/iax2/basic-call/configs2/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/configs2/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/iax2/basic-call/configs2/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/configs2/logger.conf
- copied unchanged from r826, asterisk/trunk/tests/iax2/basic-call/configs2/logger.conf
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/configs2/manager.conf
- copied unchanged from r826, asterisk/trunk/tests/iax2/basic-call/configs2/manager.conf
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/run-test
- copied unchanged from r826, asterisk/trunk/tests/iax2/basic-call/run-test
asterisk/team/pabelanger/dynamic-modules/tests/iax2/basic-call/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/iax2/basic-call/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/mixmonitor_audiohook_inherit/
- copied from r826, asterisk/trunk/tests/mixmonitor_audiohook_inherit/
asterisk/team/pabelanger/dynamic-modules/tests/mixmonitor_audiohook_inherit/configs/
- copied from r826, asterisk/trunk/tests/mixmonitor_audiohook_inherit/configs/
asterisk/team/pabelanger/dynamic-modules/tests/mixmonitor_audiohook_inherit/configs/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/mixmonitor_audiohook_inherit/configs/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/mixmonitor_audiohook_inherit/configs/features.conf
- copied unchanged from r826, asterisk/trunk/tests/mixmonitor_audiohook_inherit/configs/features.conf
asterisk/team/pabelanger/dynamic-modules/tests/mixmonitor_audiohook_inherit/run-test
- copied unchanged from r826, asterisk/trunk/tests/mixmonitor_audiohook_inherit/run-test
asterisk/team/pabelanger/dynamic-modules/tests/mixmonitor_audiohook_inherit/sounds/
- copied from r826, asterisk/trunk/tests/mixmonitor_audiohook_inherit/sounds/
asterisk/team/pabelanger/dynamic-modules/tests/mixmonitor_audiohook_inherit/sounds/talking.ulaw
- copied unchanged from r826, asterisk/trunk/tests/mixmonitor_audiohook_inherit/sounds/talking.ulaw
asterisk/team/pabelanger/dynamic-modules/tests/mixmonitor_audiohook_inherit/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/mixmonitor_audiohook_inherit/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/one-step-parking/
- copied from r826, asterisk/trunk/tests/one-step-parking/
asterisk/team/pabelanger/dynamic-modules/tests/one-step-parking/configs/
- copied from r826, asterisk/trunk/tests/one-step-parking/configs/
asterisk/team/pabelanger/dynamic-modules/tests/one-step-parking/configs/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/one-step-parking/configs/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/one-step-parking/configs/features.conf
- copied unchanged from r826, asterisk/trunk/tests/one-step-parking/configs/features.conf
asterisk/team/pabelanger/dynamic-modules/tests/one-step-parking/configs/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/one-step-parking/configs/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/one-step-parking/configs2/
- copied from r826, asterisk/trunk/tests/one-step-parking/configs2/
asterisk/team/pabelanger/dynamic-modules/tests/one-step-parking/configs2/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/one-step-parking/configs2/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/one-step-parking/configs2/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/one-step-parking/configs2/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/one-step-parking/run-test
- copied unchanged from r826, asterisk/trunk/tests/one-step-parking/run-test
asterisk/team/pabelanger/dynamic-modules/tests/one-step-parking/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/one-step-parking/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/pbx/
- copied from r826, asterisk/trunk/tests/pbx/
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files/
- copied from r826, asterisk/trunk/tests/pbx/call-files/
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files/configs/
- copied from r826, asterisk/trunk/tests/pbx/call-files/configs/
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files/configs/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/pbx/call-files/configs/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files/run-test
- copied unchanged from r826, asterisk/trunk/tests/pbx/call-files/run-test
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files/sample.call
- copied unchanged from r826, asterisk/trunk/tests/pbx/call-files/sample.call
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files/sample2.call
- copied unchanged from r826, asterisk/trunk/tests/pbx/call-files/sample2.call
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/pbx/call-files/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files2/
- copied from r826, asterisk/trunk/tests/pbx/call-files2/
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files2/run-test
- copied unchanged from r826, asterisk/trunk/tests/pbx/call-files2/run-test
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files2/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/pbx/call-files2/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files2/userA/
- copied from r826, asterisk/trunk/tests/pbx/call-files2/userA/
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files2/userA/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/pbx/call-files2/userA/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files2/userA/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/pbx/call-files2/userA/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files2/userB/
- copied from r826, asterisk/trunk/tests/pbx/call-files2/userB/
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files2/userB/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/pbx/call-files2/userB/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/pbx/call-files2/userB/iax.conf
- copied unchanged from r826, asterisk/trunk/tests/pbx/call-files2/userB/iax.conf
asterisk/team/pabelanger/dynamic-modules/tests/sip/
- copied from r826, asterisk/trunk/tests/sip/
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/
- copied from r826, asterisk/trunk/tests/sip/handle_response_refer/
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/configs/
- copied from r826, asterisk/trunk/tests/sip/handle_response_refer/configs/
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/configs/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/configs/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/configs/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/configs/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/run-test
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/run-test
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/sipp/
- copied from r826, asterisk/trunk/tests/sip/handle_response_refer/sipp/
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/sipp/data.csv
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/sipp/data.csv
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/sipp/wait-refer-200-notify.xml
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-200-notify.xml
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/sipp/wait-refer-202-error.xml
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-202-error.xml
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/sipp/wait-refer-202-notify-provisional.xml
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-202-notify-provisional.xml
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/sipp/wait-refer-202-notify.xml
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-202-notify.xml
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/sipp/wait-refer-400.xml
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-400.xml
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/sipp/wait-refer-500.xml
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-500.xml
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/sipp/wait-refer-603.xml
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-603.xml
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/sip/handle_response_refer/test.lua
- copied unchanged from r826, asterisk/trunk/tests/sip/handle_response_refer/test.lua
asterisk/team/pabelanger/dynamic-modules/tests/sip_attended_transfer_tcp/
- copied from r826, asterisk/trunk/tests/sip_attended_transfer_tcp/
asterisk/team/pabelanger/dynamic-modules/tests/sip_attended_transfer_tcp/configs/
- copied from r826, asterisk/trunk/tests/sip_attended_transfer_tcp/configs/
asterisk/team/pabelanger/dynamic-modules/tests/sip_attended_transfer_tcp/configs/extensions.conf
- copied unchanged from r826, asterisk/trunk/tests/sip_attended_transfer_tcp/configs/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/sip_attended_transfer_tcp/configs/manager.conf
- copied unchanged from r826, asterisk/trunk/tests/sip_attended_transfer_tcp/configs/manager.conf
asterisk/team/pabelanger/dynamic-modules/tests/sip_attended_transfer_tcp/configs/sip.conf
- copied unchanged from r826, asterisk/trunk/tests/sip_attended_transfer_tcp/configs/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/sip_attended_transfer_tcp/run-test
- copied unchanged from r826, asterisk/trunk/tests/sip_attended_transfer_tcp/run-test
asterisk/team/pabelanger/dynamic-modules/tests/sip_attended_transfer_tcp/test-config.yaml
- copied unchanged from r826, asterisk/trunk/tests/sip_attended_transfer_tcp/test-config.yaml
Removed:
asterisk/team/pabelanger/dynamic-modules/tests/iax-call-basic/
Modified:
asterisk/team/pabelanger/dynamic-modules/ (props changed)
asterisk/team/pabelanger/dynamic-modules/asttest/Makefile
asterisk/team/pabelanger/dynamic-modules/asttest/lib/lua/astlib.c
asterisk/team/pabelanger/dynamic-modules/asttest/lib/lua/astlib.lua
asterisk/team/pabelanger/dynamic-modules/asttest/lib/testutils.c
asterisk/team/pabelanger/dynamic-modules/asttest/self-tests/asterisk_cli/test.lua
asterisk/team/pabelanger/dynamic-modules/asttest/self-tests/asterisk_version/test.lua
asterisk/team/pabelanger/dynamic-modules/asttest/self-tests/spawn_asterisk/test.lua
asterisk/team/pabelanger/dynamic-modules/asttest/self-tests/test_skip/test.lua
asterisk/team/pabelanger/dynamic-modules/lib/python/asterisk/asterisk.py
asterisk/team/pabelanger/dynamic-modules/runtests.py
asterisk/team/pabelanger/dynamic-modules/tests/blind-transfer-parkingtimeout/configs2/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/blind-transfer-parkingtimeout/run-test
asterisk/team/pabelanger/dynamic-modules/tests/cdr/app_queue/configs/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/app_queue/run-test
asterisk/team/pabelanger/dynamic-modules/tests/cdr/app_queue/test.lua
asterisk/team/pabelanger/dynamic-modules/tests/cdr/blind-transfer-accountcode/configs/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/blind-transfer-accountcode/test.lua
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_answer/configs1/manager.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_answer/configs1/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_answer/configs2/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_busy/configs1/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_busy/configs2/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_congestion/configs1/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_congestion/configs2/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_transfer/configs1/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_dial_sip_transfer/configs2/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_after_busy_forward/configs1/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_after_busy_forward/configs2/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_before_dial/configs1/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/console_fork_before_dial/configs2/sip.conf
asterisk/team/pabelanger/dynamic-modules/tests/cdr/originate-cdr-disposition/test.lua
asterisk/team/pabelanger/dynamic-modules/tests/chanspy/chanspy_barge/run-test
asterisk/team/pabelanger/dynamic-modules/tests/chanspy/chanspy_barge/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/chanspy/chanspy_w_mixmonitor/configs/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/chanspy/chanspy_w_mixmonitor/run-test
asterisk/team/pabelanger/dynamic-modules/tests/directed_pickup/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/channel-status/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/channel-status/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/configs/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/connect/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/connect/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/control-stream-file/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/control-stream-file/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/database/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/database/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/hangup/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/hangup/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/stream-file/run-test
asterisk/team/pabelanger/dynamic-modules/tests/fastagi/stream-file/test-config.yaml
asterisk/team/pabelanger/dynamic-modules/tests/feature_attended_transfer/configs/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/feature_blonde_transfer/blonde_configs/extensions.conf
asterisk/team/pabelanger/dynamic-modules/tests/tests.yaml
Propchange: asterisk/team/pabelanger/dynamic-modules/
------------------------------------------------------------------------------
automerge = *
Propchange: asterisk/team/pabelanger/dynamic-modules/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov 12 09:58:25 2010
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-658
+/asterisk/trunk:1-827
Modified: asterisk/team/pabelanger/dynamic-modules/asttest/Makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/dynamic-modules/asttest/Makefile?view=diff&rev=828&r1=827&r2=828
==============================================================================
--- asterisk/team/pabelanger/dynamic-modules/asttest/Makefile (original)
+++ asterisk/team/pabelanger/dynamic-modules/asttest/Makefile Fri Nov 12 09:58:25 2010
@@ -22,7 +22,7 @@
INSTALL?=install
DESTDIR?=
-PREFIX?=/usr
+PREFIX?=/usr/local
EXEC_PREFIX?=$(PREFIX)
BINDIR?=$(EXEC_PREFIX)/bin
Modified: asterisk/team/pabelanger/dynamic-modules/asttest/lib/lua/astlib.c
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/dynamic-modules/asttest/lib/lua/astlib.c?view=diff&rev=828&r1=827&r2=828
==============================================================================
--- asterisk/team/pabelanger/dynamic-modules/asttest/lib/lua/astlib.c (original)
+++ asterisk/team/pabelanger/dynamic-modules/asttest/lib/lua/astlib.c Fri Nov 12 09:58:25 2010
@@ -470,9 +470,49 @@
return 1;
}
+static int set_gc_func(lua_State *L) {
+ lua_pushvalue(L, 1);
+ lua_setfield(L, LUA_REGISTRYINDEX, "astlib_asterisk_gc");
+ return 0;
+}
+
+static int setup_gc(lua_State *L) {
+ /* since we know this function is only called by internal methods, we
+ * don't do any error checking
+ *
+ * We expect two arguments, an asterisk table and a proc table */
+
+ /* create a special userdata so that we can have a __gc method called
+ * on our proc table */
+ lua_pushvalue(L, 2);
+ lua_replace(L, LUA_ENVIRONINDEX);
+
+ lua_pushliteral(L, "__gc");
+
+ lua_newuserdata(L, sizeof(char));
+
+ /* create the metatable for our special userdata */
+ lua_createtable(L, 0, 1);
+
+ /* call our __gc closure generator and store the result */
+ lua_getfield(L, LUA_REGISTRYINDEX, "astlib_asterisk_gc");
+ lua_pushvalue(L, 1);
+ lua_pushvalue(L, 2);
+ lua_call(L, 2, 1);
+ lua_setfield(L, -2, "__gc");
+
+ lua_setmetatable(L, -2);
+
+ /* store the new userdata in the proc table */
+ lua_settable(L, 2);
+ return 0;
+}
+
static luaL_Reg astlib[] = {
{"unlink", unlink_file},
{"_version", get_asterisk_version},
+ {"_set_asterisk_gc_generator", set_gc_func},
+ {"_setup_gc", setup_gc},
{NULL, NULL},
};
Modified: asterisk/team/pabelanger/dynamic-modules/asttest/lib/lua/astlib.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/dynamic-modules/asttest/lib/lua/astlib.lua?view=diff&rev=828&r1=827&r2=828
==============================================================================
--- asterisk/team/pabelanger/dynamic-modules/asttest/lib/lua/astlib.lua (original)
+++ asterisk/team/pabelanger/dynamic-modules/asttest/lib/lua/astlib.lua Fri Nov 12 09:58:25 2010
@@ -58,18 +58,17 @@
local v1 = version(v)
local v2 = version()
- if v1.svn and v2.svn and v1.branch == v2.branch then return true end
- if v2.svn then
- v1 = version("SVN-branch-" .. v .. "-r00000")
- if v1.branch == v2.branch then return true end
- end
- if not v2.svn and not v1.svn and v1.concept == v2.concept and v1.major == v2.major then
- if not v1.minor then return true end
- if v1.minor == v2.minor then return true end
- end
-
- return false
-end
+ return v1.branch == v2.branch
+end
+
+function asterisk_gc(a, p)
+ return function()
+ _stop(a, p)
+ end
+end
+
+_set_asterisk_gc_generator(asterisk_gc)
+_set_asterisk_gc_generator = nil
-- asterisk table is created in astlib.c
function asterisk:new()
@@ -94,6 +93,7 @@
"-f", "-g", "-q", "-m",
"-C", self.asterisk_conf
)
+ _setup_gc(self, p)
rawset(self, "proc", p)
end
@@ -109,6 +109,14 @@
local res, err = p:wait(300000)
if not res then
return res, err
+ end
+
+ if res ~= 0 then
+ local output = p.stdout:read("*a")
+ if not output then
+ return nil, "error connecting to asterisk cli"
+ end
+ return nil, output
end
return p.stdout:read("*a")
@@ -125,26 +133,24 @@
for _=1,10 do
local err
booted, err = self:cli("core waitfullybooted")
- if not booted then
- if err then
- error("error waiting for asterisk to fully boot: " .. err)
- else
- error("error waiting for asterisk to fully boot")
- end
- end
-
+
if #output ~= 0 then
output = output .. "=====\n"
end
- output = output .. booted
-
- if booted:find("fully booted") then
- break
- end
+ if booted then
+ output = output .. booted
+
+ if booted:find("fully booted") then
+ break
+ end
+ else
+ output = output .. err
+ end
+
posix.usleep(500000)
end
- if not booted:find("fully booted") then
+ if booted and not booted:find("fully booted") then
print("error waiting for asterisk to fully boot: " .. booted)
print("checking to see if asterisk is still running")
local res, err = proc.perror(self:wait(1000))
@@ -179,24 +185,44 @@
end
function asterisk:wait(timeout)
- if not proc then return nil, "error" end
+ if not self.proc then return nil, "error" end
return self.proc:wait(timeout)
end
-function asterisk:term(timeout)
- if not proc then return nil, "error" end
- return self.proc:term(timeout)
-end
-
-function asterisk:kill()
- if not proc then return nil, "error" end
- return self.proc:kill()
-end
-
-function asterisk:term_or_kill()
- if not proc then return nil, "error" end
- return self.proc:term_or_kill()
-end
+function _stop(a, p)
+ local res, err
+
+ -- 1.6+ stop commands
+ local stop_gracefully = "core stop gracefully"
+ local stop_now = "core stop now"
+
+ -- if this is 1.4 or less use 1.4 stop commands
+ if version() < version("1.6") then
+ stop_gracefully = "stop gracefully"
+ stop_now = "stop now"
+ end
+
+ a:cli(stop_gracefully)
+ res, err = p:wait(5000)
+ if res or (not res and err ~= "timeout") then
+ return res, err
+ end
+
+ a:cli(stop_now)
+ res, err = p:wait(5000)
+ if res or (not res and err ~= "timeout") then
+ return res, err
+ end
+
+ return p:term_or_kill()
+end
+
+function asterisk:stop()
+ if not self.proc then return nil, "error" end
+ return _stop(self, self.proc)
+end
+
+asterisk.term_or_kill = asterisk.stop
function asterisk:__newindex(conffile_name, conffile)
if (getmetatable(conffile) ~= config) then
@@ -344,12 +370,12 @@
end
asterisk_version = {}
+asterisk_version.__index = asterisk_version
function asterisk_version:new(version)
local v = {
version = version,
}
setmetatable(v, self)
- self.__index = self
v:_parse()
return v
@@ -362,6 +388,31 @@
if not self.branch then
self.branch, self.revision = self.version:match("SVN%-(.*)%-r(%d+M?)")
end
+
+ if not self.branch then
+ error("error parsing SVN version number: " .. self.version)
+ end
+
+ -- generate a synthetic version number for svn branch versions
+ self.patch = self.revision:match("(%d+)M?")
[... 1939 lines stripped ...]
More information about the asterisk-commits
mailing list