[asterisk-commits] kpfleming: branch pabelanger/issue17677 r793 - in /asterisk/team/pabelanger/i...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Sep 24 11:47:16 CDT 2010
Author: kpfleming
Date: Fri Sep 24 11:47:07 2010
New Revision: 793
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=793
Log:
manually merge this branch, so the automerge process will stop complaining about it
Added:
asterisk/team/pabelanger/issue17677/asttest/self-tests/test_atexit1/
- copied from r787, asterisk/trunk/asttest/self-tests/test_atexit1/
asterisk/team/pabelanger/issue17677/asttest/self-tests/test_atexit1/test.lua
- copied unchanged from r787, asterisk/trunk/asttest/self-tests/test_atexit1/test.lua
asterisk/team/pabelanger/issue17677/asttest/self-tests/test_atexit2/
- copied from r787, asterisk/trunk/asttest/self-tests/test_atexit2/
asterisk/team/pabelanger/issue17677/asttest/self-tests/test_atexit2/test.lua
- copied unchanged from r787, asterisk/trunk/asttest/self-tests/test_atexit2/test.lua
asterisk/team/pabelanger/issue17677/asttest/self-tests/test_atexit3/
- copied from r787, asterisk/trunk/asttest/self-tests/test_atexit3/
asterisk/team/pabelanger/issue17677/asttest/self-tests/test_atexit3/test.lua
- copied unchanged from r787, asterisk/trunk/asttest/self-tests/test_atexit3/test.lua
asterisk/team/pabelanger/issue17677/asttest/self-tests/test_skip/tests/.hidden_skip/
- copied from r787, asterisk/trunk/asttest/self-tests/test_skip/tests/.hidden_skip/
asterisk/team/pabelanger/issue17677/asttest/self-tests/test_skip/tests/.hidden_skip/test.lua
- copied unchanged from r787, asterisk/trunk/asttest/self-tests/test_skip/tests/.hidden_skip/test.lua
asterisk/team/pabelanger/issue17677/asttest/self-tests/test_skip/tests/_auto_skip/
- copied from r787, asterisk/trunk/asttest/self-tests/test_skip/tests/_auto_skip/
asterisk/team/pabelanger/issue17677/asttest/self-tests/test_skip/tests/_auto_skip/test.lua
- copied unchanged from r787, asterisk/trunk/asttest/self-tests/test_skip/tests/_auto_skip/test.lua
asterisk/team/pabelanger/issue17677/tests/callparking/
- copied from r787, asterisk/trunk/tests/callparking/
asterisk/team/pabelanger/issue17677/tests/callparking/configs/
- copied from r787, asterisk/trunk/tests/callparking/configs/
asterisk/team/pabelanger/issue17677/tests/callparking/configs/extensions.conf
- copied unchanged from r787, asterisk/trunk/tests/callparking/configs/extensions.conf
asterisk/team/pabelanger/issue17677/tests/callparking/configs/iax.conf
- copied unchanged from r787, asterisk/trunk/tests/callparking/configs/iax.conf
asterisk/team/pabelanger/issue17677/tests/callparking/configs2/
- copied from r787, asterisk/trunk/tests/callparking/configs2/
asterisk/team/pabelanger/issue17677/tests/callparking/configs2/extensions.conf
- copied unchanged from r787, asterisk/trunk/tests/callparking/configs2/extensions.conf
asterisk/team/pabelanger/issue17677/tests/callparking/configs2/iax.conf
- copied unchanged from r787, asterisk/trunk/tests/callparking/configs2/iax.conf
asterisk/team/pabelanger/issue17677/tests/callparking/configs3/
- copied from r787, asterisk/trunk/tests/callparking/configs3/
asterisk/team/pabelanger/issue17677/tests/callparking/configs3/extensions.conf
- copied unchanged from r787, asterisk/trunk/tests/callparking/configs3/extensions.conf
asterisk/team/pabelanger/issue17677/tests/callparking/configs3/iax.conf
- copied unchanged from r787, asterisk/trunk/tests/callparking/configs3/iax.conf
asterisk/team/pabelanger/issue17677/tests/callparking/run-test
- copied unchanged from r787, asterisk/trunk/tests/callparking/run-test
asterisk/team/pabelanger/issue17677/tests/callparking/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/callparking/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_answer/configs1/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_dial_sip_answer/configs1/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_answer/configs1/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_dial_sip_answer/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_answer/configs2/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_dial_sip_answer/configs2/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_answer/configs2/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_dial_sip_answer/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_busy/configs1/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_dial_sip_busy/configs1/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_busy/configs1/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_dial_sip_busy/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_busy/configs2/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_dial_sip_busy/configs2/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_busy/configs2/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_dial_sip_busy/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_congestion/configs1/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs1/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_congestion/configs1/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_congestion/configs2/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs2/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_congestion/configs2/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_dial_sip_congestion/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_transfer/configs1/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs1/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_transfer/configs1/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_transfer/configs2/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs2/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_transfer/configs2/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_dial_sip_transfer/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_after_busy_forward/configs1/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs1/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_after_busy_forward/configs1/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_after_busy_forward/configs2/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs2/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_after_busy_forward/configs2/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_fork_after_busy_forward/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_before_dial/configs1/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_fork_before_dial/configs1/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_before_dial/configs1/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_fork_before_dial/configs1/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_before_dial/configs2/branch-1.4/
- copied from r787, asterisk/trunk/tests/cdr/console_fork_before_dial/configs2/branch-1.4/
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_before_dial/configs2/branch-1.4/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/cdr/console_fork_before_dial/configs2/branch-1.4/sip.conf
asterisk/team/pabelanger/issue17677/tests/fastagi/control-stream-file/
- copied from r787, asterisk/trunk/tests/fastagi/control-stream-file/
asterisk/team/pabelanger/issue17677/tests/fastagi/control-stream-file/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/control-stream-file/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/control-stream-file/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/control-stream-file/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/database/
- copied from r787, asterisk/trunk/tests/fastagi/database/
asterisk/team/pabelanger/issue17677/tests/fastagi/database/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/database/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/database/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/database/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/execute/
- copied from r787, asterisk/trunk/tests/fastagi/execute/
asterisk/team/pabelanger/issue17677/tests/fastagi/execute/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/execute/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/execute/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/execute/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/get-data/
- copied from r787, asterisk/trunk/tests/fastagi/get-data/
asterisk/team/pabelanger/issue17677/tests/fastagi/get-data/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/get-data/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/get-data/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/get-data/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/record-file/
- copied from r787, asterisk/trunk/tests/fastagi/record-file/
asterisk/team/pabelanger/issue17677/tests/fastagi/record-file/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/record-file/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/record-file/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/record-file/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/say-alpha/
- copied from r787, asterisk/trunk/tests/fastagi/say-alpha/
asterisk/team/pabelanger/issue17677/tests/fastagi/say-alpha/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-alpha/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/say-alpha/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-alpha/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/say-date/
- copied from r787, asterisk/trunk/tests/fastagi/say-date/
asterisk/team/pabelanger/issue17677/tests/fastagi/say-date/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-date/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/say-date/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-date/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/say-datetime/
- copied from r787, asterisk/trunk/tests/fastagi/say-datetime/
asterisk/team/pabelanger/issue17677/tests/fastagi/say-datetime/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-datetime/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/say-datetime/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-datetime/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/say-digits/
- copied from r787, asterisk/trunk/tests/fastagi/say-digits/
asterisk/team/pabelanger/issue17677/tests/fastagi/say-digits/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-digits/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/say-digits/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-digits/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/say-number/
- copied from r787, asterisk/trunk/tests/fastagi/say-number/
asterisk/team/pabelanger/issue17677/tests/fastagi/say-number/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-number/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/say-number/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-number/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/say-phonetic/
- copied from r787, asterisk/trunk/tests/fastagi/say-phonetic/
asterisk/team/pabelanger/issue17677/tests/fastagi/say-phonetic/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-phonetic/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/say-phonetic/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-phonetic/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/say-time/
- copied from r787, asterisk/trunk/tests/fastagi/say-time/
asterisk/team/pabelanger/issue17677/tests/fastagi/say-time/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-time/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/say-time/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/say-time/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/sounds/
- copied from r787, asterisk/trunk/tests/fastagi/sounds/
asterisk/team/pabelanger/issue17677/tests/fastagi/sounds/talking.ulaw
- copied unchanged from r787, asterisk/trunk/tests/fastagi/sounds/talking.ulaw
asterisk/team/pabelanger/issue17677/tests/fastagi/stream-file/
- copied from r787, asterisk/trunk/tests/fastagi/stream-file/
asterisk/team/pabelanger/issue17677/tests/fastagi/stream-file/run-test
- copied unchanged from r787, asterisk/trunk/tests/fastagi/stream-file/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/stream-file/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/fastagi/stream-file/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/iax2/
- copied from r787, asterisk/trunk/tests/iax2/
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/ (props changed)
- copied from r787, asterisk/trunk/tests/iax2/basic-call/
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/configs/
- copied from r787, asterisk/trunk/tests/iax2/basic-call/configs/
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/configs/extensions.conf
- copied unchanged from r787, asterisk/trunk/tests/iax2/basic-call/configs/extensions.conf
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/configs/iax.conf
- copied unchanged from r787, asterisk/trunk/tests/iax2/basic-call/configs/iax.conf
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/configs/logger.conf
- copied unchanged from r787, asterisk/trunk/tests/iax2/basic-call/configs/logger.conf
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/configs/manager.conf
- copied unchanged from r787, asterisk/trunk/tests/iax2/basic-call/configs/manager.conf
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/configs2/
- copied from r787, asterisk/trunk/tests/iax2/basic-call/configs2/
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/configs2/extensions.conf
- copied unchanged from r787, asterisk/trunk/tests/iax2/basic-call/configs2/extensions.conf
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/configs2/iax.conf
- copied unchanged from r787, asterisk/trunk/tests/iax2/basic-call/configs2/iax.conf
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/configs2/logger.conf
- copied unchanged from r787, asterisk/trunk/tests/iax2/basic-call/configs2/logger.conf
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/configs2/manager.conf
- copied unchanged from r787, asterisk/trunk/tests/iax2/basic-call/configs2/manager.conf
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/run-test
- copied unchanged from r787, asterisk/trunk/tests/iax2/basic-call/run-test
asterisk/team/pabelanger/issue17677/tests/iax2/basic-call/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/iax2/basic-call/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/mixmonitor_audiohook_inherit/
- copied from r787, asterisk/trunk/tests/mixmonitor_audiohook_inherit/
asterisk/team/pabelanger/issue17677/tests/mixmonitor_audiohook_inherit/configs/
- copied from r787, asterisk/trunk/tests/mixmonitor_audiohook_inherit/configs/
asterisk/team/pabelanger/issue17677/tests/mixmonitor_audiohook_inherit/configs/extensions.conf
- copied unchanged from r787, asterisk/trunk/tests/mixmonitor_audiohook_inherit/configs/extensions.conf
asterisk/team/pabelanger/issue17677/tests/mixmonitor_audiohook_inherit/configs/features.conf
- copied unchanged from r787, asterisk/trunk/tests/mixmonitor_audiohook_inherit/configs/features.conf
asterisk/team/pabelanger/issue17677/tests/mixmonitor_audiohook_inherit/run-test
- copied unchanged from r787, asterisk/trunk/tests/mixmonitor_audiohook_inherit/run-test
asterisk/team/pabelanger/issue17677/tests/mixmonitor_audiohook_inherit/sounds/
- copied from r787, asterisk/trunk/tests/mixmonitor_audiohook_inherit/sounds/
asterisk/team/pabelanger/issue17677/tests/mixmonitor_audiohook_inherit/sounds/talking.ulaw
- copied unchanged from r787, asterisk/trunk/tests/mixmonitor_audiohook_inherit/sounds/talking.ulaw
asterisk/team/pabelanger/issue17677/tests/mixmonitor_audiohook_inherit/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/mixmonitor_audiohook_inherit/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/one-step-parking/
- copied from r787, asterisk/trunk/tests/one-step-parking/
asterisk/team/pabelanger/issue17677/tests/one-step-parking/configs/
- copied from r787, asterisk/trunk/tests/one-step-parking/configs/
asterisk/team/pabelanger/issue17677/tests/one-step-parking/configs/extensions.conf
- copied unchanged from r787, asterisk/trunk/tests/one-step-parking/configs/extensions.conf
asterisk/team/pabelanger/issue17677/tests/one-step-parking/configs/features.conf
- copied unchanged from r787, asterisk/trunk/tests/one-step-parking/configs/features.conf
asterisk/team/pabelanger/issue17677/tests/one-step-parking/configs/iax.conf
- copied unchanged from r787, asterisk/trunk/tests/one-step-parking/configs/iax.conf
asterisk/team/pabelanger/issue17677/tests/one-step-parking/configs2/
- copied from r787, asterisk/trunk/tests/one-step-parking/configs2/
asterisk/team/pabelanger/issue17677/tests/one-step-parking/configs2/extensions.conf
- copied unchanged from r787, asterisk/trunk/tests/one-step-parking/configs2/extensions.conf
asterisk/team/pabelanger/issue17677/tests/one-step-parking/configs2/iax.conf
- copied unchanged from r787, asterisk/trunk/tests/one-step-parking/configs2/iax.conf
asterisk/team/pabelanger/issue17677/tests/one-step-parking/run-test
- copied unchanged from r787, asterisk/trunk/tests/one-step-parking/run-test
asterisk/team/pabelanger/issue17677/tests/one-step-parking/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/one-step-parking/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/pbx/
- copied from r787, asterisk/trunk/tests/pbx/
asterisk/team/pabelanger/issue17677/tests/pbx/call-files/
- copied from r787, asterisk/trunk/tests/pbx/call-files/
asterisk/team/pabelanger/issue17677/tests/pbx/call-files/configs/
- copied from r787, asterisk/trunk/tests/pbx/call-files/configs/
asterisk/team/pabelanger/issue17677/tests/pbx/call-files/configs/extensions.conf
- copied unchanged from r787, asterisk/trunk/tests/pbx/call-files/configs/extensions.conf
asterisk/team/pabelanger/issue17677/tests/pbx/call-files/run-test
- copied unchanged from r787, asterisk/trunk/tests/pbx/call-files/run-test
asterisk/team/pabelanger/issue17677/tests/pbx/call-files/sample.call
- copied unchanged from r787, asterisk/trunk/tests/pbx/call-files/sample.call
asterisk/team/pabelanger/issue17677/tests/pbx/call-files/sample2.call
- copied unchanged from r787, asterisk/trunk/tests/pbx/call-files/sample2.call
asterisk/team/pabelanger/issue17677/tests/pbx/call-files/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/pbx/call-files/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/sip/
- copied from r787, asterisk/trunk/tests/sip/
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/
- copied from r787, asterisk/trunk/tests/sip/handle_response_refer/
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/configs/
- copied from r787, asterisk/trunk/tests/sip/handle_response_refer/configs/
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/configs/extensions.conf
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/configs/extensions.conf
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/configs/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/configs/sip.conf
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/run-test
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/run-test
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/sipp/
- copied from r787, asterisk/trunk/tests/sip/handle_response_refer/sipp/
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/sipp/data.csv
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/sipp/data.csv
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/sipp/wait-refer-200-notify.xml
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-200-notify.xml
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/sipp/wait-refer-202-error.xml
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-202-error.xml
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/sipp/wait-refer-202-notify-provisional.xml
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-202-notify-provisional.xml
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/sipp/wait-refer-202-notify.xml
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-202-notify.xml
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/sipp/wait-refer-400.xml
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-400.xml
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/sipp/wait-refer-500.xml
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-500.xml
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/sipp/wait-refer-603.xml
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/sipp/wait-refer-603.xml
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/sip/handle_response_refer/test.lua
- copied unchanged from r787, asterisk/trunk/tests/sip/handle_response_refer/test.lua
asterisk/team/pabelanger/issue17677/tests/sip_attended_transfer_tcp/
- copied from r787, asterisk/trunk/tests/sip_attended_transfer_tcp/
asterisk/team/pabelanger/issue17677/tests/sip_attended_transfer_tcp/configs/
- copied from r787, asterisk/trunk/tests/sip_attended_transfer_tcp/configs/
asterisk/team/pabelanger/issue17677/tests/sip_attended_transfer_tcp/configs/extensions.conf
- copied unchanged from r787, asterisk/trunk/tests/sip_attended_transfer_tcp/configs/extensions.conf
asterisk/team/pabelanger/issue17677/tests/sip_attended_transfer_tcp/configs/manager.conf
- copied unchanged from r787, asterisk/trunk/tests/sip_attended_transfer_tcp/configs/manager.conf
asterisk/team/pabelanger/issue17677/tests/sip_attended_transfer_tcp/configs/sip.conf
- copied unchanged from r787, asterisk/trunk/tests/sip_attended_transfer_tcp/configs/sip.conf
asterisk/team/pabelanger/issue17677/tests/sip_attended_transfer_tcp/run-test
- copied unchanged from r787, asterisk/trunk/tests/sip_attended_transfer_tcp/run-test
asterisk/team/pabelanger/issue17677/tests/sip_attended_transfer_tcp/test-config.yaml
- copied unchanged from r787, asterisk/trunk/tests/sip_attended_transfer_tcp/test-config.yaml
Removed:
asterisk/team/pabelanger/issue17677/tests/blind-transfer-parkingtimeout/configs/logger.conf
asterisk/team/pabelanger/issue17677/tests/blind-transfer-parkingtimeout/configs2/logger.conf
asterisk/team/pabelanger/issue17677/tests/iax-call-basic/
Modified:
asterisk/team/pabelanger/issue17677/ (props changed)
asterisk/team/pabelanger/issue17677/asttest/Makefile
asterisk/team/pabelanger/issue17677/asttest/include/asttest/lua/testlib.h
asterisk/team/pabelanger/issue17677/asttest/lib/lua/astlib.c
asterisk/team/pabelanger/issue17677/asttest/lib/lua/astlib.lua
asterisk/team/pabelanger/issue17677/asttest/lib/lua/testlib.c
asterisk/team/pabelanger/issue17677/asttest/lib/lua/testlib.lua
asterisk/team/pabelanger/issue17677/asttest/lib/testutils.c
asterisk/team/pabelanger/issue17677/asttest/self-tests/asterisk_version/test.lua
asterisk/team/pabelanger/issue17677/asttest/self-tests/test_skip/test.lua
asterisk/team/pabelanger/issue17677/lib/python/asterisk/asterisk.py
asterisk/team/pabelanger/issue17677/runtests.py
asterisk/team/pabelanger/issue17677/tests/blind-transfer-parkingtimeout/configs/iax.conf
asterisk/team/pabelanger/issue17677/tests/blind-transfer-parkingtimeout/configs2/extensions.conf
asterisk/team/pabelanger/issue17677/tests/blind-transfer-parkingtimeout/configs2/iax.conf
asterisk/team/pabelanger/issue17677/tests/blind-transfer-parkingtimeout/run-test
asterisk/team/pabelanger/issue17677/tests/cdr/app_dial_G_flag/sipp/call.xml
asterisk/team/pabelanger/issue17677/tests/cdr/app_dial_G_flag/sipp/wait-for-call.xml
asterisk/team/pabelanger/issue17677/tests/cdr/app_queue/configs/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/app_queue/sipp/call.xml
asterisk/team/pabelanger/issue17677/tests/cdr/app_queue/sipp/wait-for-call-hangup.xml
asterisk/team/pabelanger/issue17677/tests/cdr/blind-transfer-accountcode/configs/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/blind-transfer-accountcode/sipp/wait-for-call-do-hangup.xml
asterisk/team/pabelanger/issue17677/tests/cdr/blind-transfer-accountcode/sipp/wait-for-call.xml
asterisk/team/pabelanger/issue17677/tests/cdr/blind-transfer-accountcode/test.lua
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_answer/configs1/manager.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_answer/configs1/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_answer/configs2/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_busy/configs1/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_busy/configs2/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_congestion/configs1/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_congestion/configs2/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_transfer/configs1/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_dial_sip_transfer/configs2/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_after_busy_forward/configs1/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_after_busy_forward/configs2/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_before_dial/configs1/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/console_fork_before_dial/configs2/sip.conf
asterisk/team/pabelanger/issue17677/tests/cdr/originate-cdr-disposition/sipp/wait-for-call-busy.xml
asterisk/team/pabelanger/issue17677/tests/cdr/originate-cdr-disposition/sipp/wait-for-call-congestion.xml
asterisk/team/pabelanger/issue17677/tests/cdr/originate-cdr-disposition/sipp/wait-for-call-timeout.xml
asterisk/team/pabelanger/issue17677/tests/cdr/originate-cdr-disposition/sipp/wait-for-call.xml
asterisk/team/pabelanger/issue17677/tests/chanspy/chanspy_barge/run-test
asterisk/team/pabelanger/issue17677/tests/chanspy/chanspy_barge/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/chanspy/chanspy_w_mixmonitor/configs/extensions.conf
asterisk/team/pabelanger/issue17677/tests/chanspy/chanspy_w_mixmonitor/run-test
asterisk/team/pabelanger/issue17677/tests/directed_pickup/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/channel-status/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/channel-status/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/configs/extensions.conf
asterisk/team/pabelanger/issue17677/tests/fastagi/connect/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/connect/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/fastagi/hangup/run-test
asterisk/team/pabelanger/issue17677/tests/fastagi/hangup/test-config.yaml
asterisk/team/pabelanger/issue17677/tests/feature_attended_transfer/configs/extensions.conf
asterisk/team/pabelanger/issue17677/tests/feature_blonde_transfer/blonde_configs/extensions.conf
asterisk/team/pabelanger/issue17677/tests/manager/login/run-test
asterisk/team/pabelanger/issue17677/tests/queues/queue_baseline/configs/modules.conf
asterisk/team/pabelanger/issue17677/tests/sip_one_legged_transfer/run-test
asterisk/team/pabelanger/issue17677/tests/tests.yaml
asterisk/team/pabelanger/issue17677/tests/udptl/configs2/extensions.conf
asterisk/team/pabelanger/issue17677/tests/udptl_v6/configs2/extensions.conf
Propchange: asterisk/team/pabelanger/issue17677/
('automerge' removed)
Propchange: asterisk/team/pabelanger/issue17677/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep 24 11:47:07 2010
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-567
+/asterisk/trunk:1-792
Modified: asterisk/team/pabelanger/issue17677/asttest/Makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/issue17677/asttest/Makefile?view=diff&rev=793&r1=792&r2=793
==============================================================================
--- asterisk/team/pabelanger/issue17677/asttest/Makefile (original)
+++ asterisk/team/pabelanger/issue17677/asttest/Makefile Fri Sep 24 11:47:07 2010
@@ -22,7 +22,7 @@
INSTALL?=install
DESTDIR?=
-PREFIX?=/usr
+PREFIX?=/usr/local
EXEC_PREFIX?=$(PREFIX)
BINDIR?=$(EXEC_PREFIX)/bin
@@ -160,7 +160,7 @@
test: asttest
LUA_PATH=$(PWD)/../lib/lua/?.lua\;\; \
LUA_CPATH=$(PWD)/../lib/lua/\?.so\;\; \
- ./asttest self-tests
+ $(GDB) ./asttest self-tests
clean:
rm -f asttest $(OBJS) $(M_OBJS) $(C_OBJS) $(G_OBJS) $(N_OBJS) $(L_OBJS)
Modified: asterisk/team/pabelanger/issue17677/asttest/include/asttest/lua/testlib.h
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/issue17677/asttest/include/asttest/lua/testlib.h?view=diff&rev=793&r1=792&r2=793
==============================================================================
--- asterisk/team/pabelanger/issue17677/asttest/include/asttest/lua/testlib.h (original)
+++ asterisk/team/pabelanger/issue17677/asttest/include/asttest/lua/testlib.h Fri Sep 24 11:47:07 2010
@@ -22,6 +22,10 @@
#include <lua.h>
int testlib_expected_fail(lua_State *L);
+int testlib_atexit(lua_State *L, int result_index);
+int testlib_preprocess_result(lua_State *L);
+int testlib_default_result(lua_State *L);
+
int luaopen_testlib(lua_State *L);
#endif
Modified: asterisk/team/pabelanger/issue17677/asttest/lib/lua/astlib.c
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/issue17677/asttest/lib/lua/astlib.c?view=diff&rev=793&r1=792&r2=793
==============================================================================
--- asterisk/team/pabelanger/issue17677/asttest/lib/lua/astlib.c (original)
+++ asterisk/team/pabelanger/issue17677/asttest/lib/lua/astlib.c Fri Sep 24 11:47:07 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/issue17677/asttest/lib/lua/astlib.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/issue17677/asttest/lib/lua/astlib.lua?view=diff&rev=793&r1=792&r2=793
==============================================================================
--- asterisk/team/pabelanger/issue17677/asttest/lib/lua/astlib.lua (original)
+++ asterisk/team/pabelanger/issue17677/asttest/lib/lua/astlib.lua Fri Sep 24 11:47:07 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
@@ -179,24 +179,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
@@ -227,7 +247,7 @@
function asterisk:manager_connect()
local m = manager:new()
- local res, err = m:connect("localhost", self.configs["manager.conf"]["general"].port)
+ local res, err = m:connect(self.configs["manager.conf"]["general"].bindaddr, self.configs["manager.conf"]["general"].port)
if not res then
return nil, err
end
@@ -315,8 +335,8 @@
local c = self:new_config("manager.conf")
local s = c:new_section("general")
s["enabled"] = "yes"
- s["bindaddr"] = "0.0.0.0"
- s["port"] = "538" .. self.index
+ s["bindaddr"] = "127.0.0." .. self.index
+ s["port"] = "5038"
s = c:new_section("asttest")
s["secret"] = "asttest"
@@ -344,12 +364,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 +382,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?")
+ self.concept, self.major, self.minor = self.branch:match("branch%-(%d+).(%d+).(%d+)")
+ if not self.concept then
+ self.minor = "999" -- assume the SVN branch is newer than all released versions
+ self.concept, self.major = self.branch:match("branch%-(%d+).(%d+)")
+ end
+ if not self.concept then
+ if self.branch == "trunk" then
+ self.concept = "999"
+ self.major = "0"
+ self.minor = "0"
+ else
+ -- branch names that don't match are greater
+ -- than everything except trunk
+ self.concept = "998"
+ self.major = "0"
+ self.minor = "0"
+ end
+ end
else
self.concept, self.major, self.minor, self.patch = self.version:match("(%d+).(%d+).(%d+).(%d+)")
[... 2550 lines stripped ...]
More information about the asterisk-commits
mailing list