<p>Richard Mudgett has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/9228">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">voicemail: Fix tests after chan_sip to chan_pjsip conversion.<br><br>* Fixed a syntax error in<br>tests/apps/voicemail/leave_voicemail_forwarding/run-test<br>* Fixed SIP -> PJSIP channel name reference in<br>tests/apps/voicemail/leave_voicemail_nominal/run-test<br>tests/apps/voicemail/leave_voicemail_priority/run-test<br>* Updated voicemail test dependencies.<br><br>Change-Id: I753a1712504169634d6761db2343e5f3429872e9<br>---<br>M tests/apps/voicemail/authenticate_extensions/test-config.yaml<br>M tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml<br>M tests/apps/voicemail/authenticate_invalid_password/test-config.yaml<br>M tests/apps/voicemail/authenticate_nominal/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_callback/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_delete/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_dialout/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_envelope/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_forward/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_new_user/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_nominal/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_reply/test-config.yaml<br>M tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml<br>M tests/apps/voicemail/func_vmcount/test-config.yaml<br>M tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml<br>M tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml<br>M tests/apps/voicemail/leave_voicemail_forwarding/run-test<br>M tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml<br>M tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml<br>M tests/apps/voicemail/leave_voicemail_nominal/run-test<br>M tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml<br>M tests/apps/voicemail/leave_voicemail_priority/run-test<br>M tests/apps/voicemail/leave_voicemail_priority/test-config.yaml<br>M tests/apps/voicemail/play_message/test-config.yaml<br>M tests/apps/voicemail/tests.yaml<br>34 files changed, 186 insertions(+), 118 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/28/9228/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/tests/apps/voicemail/authenticate_extensions/test-config.yaml b/tests/apps/voicemail/authenticate_extensions/test-config.yaml<br>index 466669a..f561df7 100644<br>--- a/tests/apps/voicemail/authenticate_extensions/test-config.yaml<br>+++ b/tests/apps/voicemail/authenticate_extensions/test-config.yaml<br>@@ -9,9 +9,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml b/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml<br>index 13bf03f..1def118 100644<br>--- a/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml<br>+++ b/tests/apps/voicemail/authenticate_invalid_mailbox/test-config.yaml<br>@@ -9,9 +9,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml b/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml<br>index 0834058..e026a36 100644<br>--- a/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml<br>+++ b/tests/apps/voicemail/authenticate_invalid_password/test-config.yaml<br>@@ -9,9 +9,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/authenticate_nominal/test-config.yaml b/tests/apps/voicemail/authenticate_nominal/test-config.yaml<br>index f0f6521..cfd1f9c 100644<br>--- a/tests/apps/voicemail/authenticate_nominal/test-config.yaml<br>+++ b/tests/apps/voicemail/authenticate_nominal/test-config.yaml<br>@@ -10,9 +10,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_callback/test-config.yaml b/tests/apps/voicemail/check_voicemail_callback/test-config.yaml<br>index 7c7e112..61df89f 100644<br>--- a/tests/apps/voicemail/check_voicemail_callback/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_callback/test-config.yaml<br>@@ -10,9 +10,11 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_delete/test-config.yaml b/tests/apps/voicemail/check_voicemail_delete/test-config.yaml<br>index 29e02e9..65b68b1 100644<br>--- a/tests/apps/voicemail/check_voicemail_delete/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_delete/test-config.yaml<br>@@ -10,9 +10,11 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml b/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml<br>index 9d682f9..3ce70d9 100644<br>--- a/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_dialout/test-config.yaml<br>@@ -9,9 +9,11 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml b/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml<br>index 939ab88..2bc4679 100644<br>--- a/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_envelope/test-config.yaml<br>@@ -11,9 +11,11 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_forward/test-config.yaml b/tests/apps/voicemail/check_voicemail_forward/test-config.yaml<br>index acd7785..c3cf7d2 100644<br>--- a/tests/apps/voicemail/check_voicemail_forward/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_forward/test-config.yaml<br>@@ -9,10 +9,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml b/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml<br>index f0971ff..0d5c5f8 100644<br>--- a/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_forward_hangup/test-config.yaml<br>@@ -10,10 +10,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml b/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml<br>index ab48613..1df05af 100644<br>--- a/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_forward_with_prepend/test-config.yaml<br>@@ -9,10 +9,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml b/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml<br>index 1c4d32d..6f191c2 100644<br>--- a/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_new_user/test-config.yaml<br>@@ -11,10 +11,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml b/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml<br>index 2c2ed55..efb44de 100644<br>--- a/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_new_user_hangup/test-config.yaml<br>@@ -10,10 +10,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml b/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml<br>index 6089973..2539b32 100644<br>--- a/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_nominal/test-config.yaml<br>@@ -10,9 +10,11 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml<br>index b157464..7b0c7ec 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_change_password/test-config.yaml<br>@@ -11,10 +11,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml<br>index bfd8156..fa8ba80 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_change_password_spooldir/test-config.yaml<br>@@ -12,10 +12,12 @@<br>         - buildoption: 'TEST_FRAMEWORK'<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml<br>index de47837..4bdf53b 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_busy/test-config.yaml<br>@@ -8,10 +8,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml<br>index 1b5dcac..6c0ecd9 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_name/test-config.yaml<br>@@ -8,10 +8,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml<br>index 1b5dcac..6c0ecd9 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_temp/test-config.yaml<br>@@ -8,10 +8,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml b/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml<br>index b852f21..eba282b 100644<br>--- a/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_options_record_unavail/test-config.yaml<br>@@ -8,10 +8,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_reply/test-config.yaml b/tests/apps/voicemail/check_voicemail_reply/test-config.yaml<br>index 9979e6c..e6c286a 100644<br>--- a/tests/apps/voicemail/check_voicemail_reply/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_reply/test-config.yaml<br>@@ -10,10 +10,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml b/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml<br>index 1f86f3f..69c392c 100644<br>--- a/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml<br>+++ b/tests/apps/voicemail/check_voicemail_while_leaving_msg/test-config.yaml<br>@@ -14,10 +14,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk : 'app_voicemail'<br>-        - asterisk : 'app_senddtmf'<br>-        - asterisk : 'app_playback'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_playback'<br>+        - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/func_vmcount/test-config.yaml b/tests/apps/voicemail/func_vmcount/test-config.yaml<br>index 43b5874..9a185f6 100644<br>--- a/tests/apps/voicemail/func_vmcount/test-config.yaml<br>+++ b/tests/apps/voicemail/func_vmcount/test-config.yaml<br>@@ -7,9 +7,11 @@<br> <br> properties:<br>     dependencies:<br>-        - asterisk : 'app_voicemail'<br>         - python : 'twisted'<br>         - python : 'starpy'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'func_vmcount'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml b/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml<br>index 63fe6d8..16899b3 100644<br>--- a/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml<br>+++ b/tests/apps/voicemail/leave_voicemail_contexts/test-config.yaml<br>@@ -8,9 +8,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk: 'app_voicemail'<br>+        - asterisk: 'app_playback'<br>         - asterisk: 'app_senddtmf'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml b/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml<br>index 4f15d61..c620179 100644<br>--- a/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml<br>+++ b/tests/apps/voicemail/leave_voicemail_external_notification/test-config.yaml<br>@@ -11,9 +11,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk: 'app_voicemail'<br>+        - asterisk: 'app_playback'<br>         - asterisk: 'app_senddtmf'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/run-test b/tests/apps/voicemail/leave_voicemail_forwarding/run-test<br>index d604fe2..8a8ad93 100755<br>--- a/tests/apps/voicemail/leave_voicemail_forwarding/run-test<br>+++ b/tests/apps/voicemail/leave_voicemail_forwarding/run-test<br>@@ -107,7 +107,6 @@<br> <br>         self.create_asterisk(2)<br> <br>-<br>     def ami_connect(self, ami):<br>         super(LeaveVoicemailForwarding, self).ami_connect(ami)<br>         self.audioFile = os.path.join(os.getcwd(), "%s/sounds/talking" % (self.testParentDir))<br>@@ -129,7 +128,7 @@<br> <br>     def originate_call(self):<br>         extension = self.extensions[self.test_counter]<br>-        logger.info("Originating call to PJSIP/" + str(extension)) + "@ast1"<br>+        logger.info("Originating call to PJSIP/" + str(extension) + "@ast1")<br>         df = self.ami_sender.originate("PJSIP/" + str(extension) + "@ast1", "voicemailCaller", "wait", 1, None, "CallId-" + str(extension), None, None, None, {}, True )<br>         df.addErrback(self.handle_originate_failure)<br> <br>@@ -155,7 +154,6 @@<br>             self.sender_channel = "PJSIP/ast1-0000000" + str(self.test_counter)<br>             self.test_state_controller.change_state(StartVoiceMailState(self.test_state_controller, self))<br>             self.originate_call()<br>-<br> <br>     def run(self):<br>         super(LeaveVoicemailForwarding, self).run()<br>@@ -204,4 +202,4 @@<br>     return 0<br> <br> if __name__ == "__main__":<br>-   sys.exit(main() or 0)<br>+    sys.exit(main() or 0)<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml b/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml<br>index 0afafa7..8eb7188 100644<br>--- a/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml<br>+++ b/tests/apps/voicemail/leave_voicemail_forwarding/test-config.yaml<br>@@ -10,9 +10,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk: 'app_voicemail'<br>+        - asterisk: 'app_playback'<br>         - asterisk: 'app_senddtmf'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml<br>index 41f0078..32e9a61 100644<br>--- a/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml<br>+++ b/tests/apps/voicemail/leave_voicemail_forwarding_auto_urgent/test-config.yaml<br>@@ -10,9 +10,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk: 'app_voicemail'<br>+        - asterisk: 'app_playback'<br>         - asterisk: 'app_senddtmf'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/leave_voicemail_nominal/run-test b/tests/apps/voicemail/leave_voicemail_nominal/run-test<br>index 651c9d2..04d67b7 100755<br>--- a/tests/apps/voicemail/leave_voicemail_nominal/run-test<br>+++ b/tests/apps/voicemail/leave_voicemail_nominal/run-test<br>@@ -150,7 +150,7 @@<br>         else:<br>             """ Originate the next call and reset the state machine """<br>             self.test_counter += 1<br>-            self.sender_channel = "SIP/ast1-0000000" + str(self.test_counter)<br>+            self.sender_channel = "PJSIP/ast1-0000000" + str(self.test_counter)<br>             self.test_state_controller.change_state(StartVoiceMailState(self.test_state_controller, self))<br>             self.originate_call()<br> <br>diff --git a/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml b/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml<br>index cc19050..772531d 100644<br>--- a/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml<br>+++ b/tests/apps/voicemail/leave_voicemail_nominal/test-config.yaml<br>@@ -11,8 +11,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk: 'app_voicemail'<br>+        - asterisk: 'app_playback'<br>         - asterisk: 'app_senddtmf'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/leave_voicemail_priority/run-test b/tests/apps/voicemail/leave_voicemail_priority/run-test<br>index 17451e7..ffc5d59 100755<br>--- a/tests/apps/voicemail/leave_voicemail_priority/run-test<br>+++ b/tests/apps/voicemail/leave_voicemail_priority/run-test<br>@@ -146,7 +146,7 @@<br>         else:<br>             """ Originate the next call and reset the state machine """<br>             self.test_counter += 1<br>-            self.sender_channel = "SIP/ast1-0000000" + str(self.test_counter)<br>+            self.sender_channel = "PJSIP/ast1-0000000" + str(self.test_counter)<br>             self.test_state_controller.change_state(StartVoiceMailState(self.test_state_controller, self))<br>             self.originate_call()<br> <br>diff --git a/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml b/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml<br>index c89d2a1..95bb33e 100644<br>--- a/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml<br>+++ b/tests/apps/voicemail/leave_voicemail_priority/test-config.yaml<br>@@ -9,9 +9,12 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>-        - asterisk: 'app_voicemail'<br>+        - asterisk: 'app_playback'<br>         - asterisk: 'app_senddtmf'<br>-        - asterisk : 'chan_pjsip'<br>+        - asterisk: 'app_userevent'<br>+        - asterisk: 'app_voicemail'<br>+        - asterisk: 'chan_pjsip'<br>+        - asterisk: 'res_pjsip'<br>     tags:<br>         - voicemail<br>         - apps<br>diff --git a/tests/apps/voicemail/play_message/test-config.yaml b/tests/apps/voicemail/play_message/test-config.yaml<br>index 3af7af1..904ffda 100644<br>--- a/tests/apps/voicemail/play_message/test-config.yaml<br>+++ b/tests/apps/voicemail/play_message/test-config.yaml<br>@@ -13,6 +13,7 @@<br>     dependencies:<br>         - python : 'twisted'<br>         - python : 'starpy'<br>+        - asterisk: 'app_userevent'<br>         - asterisk: 'app_voicemail'<br>     tags:<br>         - voicemail<br>diff --git a/tests/apps/voicemail/tests.yaml b/tests/apps/voicemail/tests.yaml<br>index 0435f18..0ec6c61 100644<br>--- a/tests/apps/voicemail/tests.yaml<br>+++ b/tests/apps/voicemail/tests.yaml<br>@@ -1,32 +1,32 @@<br> # Enter tests here in the order they should be considered for execution:<br> tests:<br>-    - test: 'leave_voicemail_nominal'<br>-    - test: 'leave_voicemail_contexts'<br>-    - test: 'leave_voicemail_priority'<br>-    - test: 'leave_voicemail_forwarding'<br>-    - test: 'leave_voicemail_forwarding_auto_urgent'<br>-    - test: 'leave_voicemail_external_notification'<br>-    - test: 'func_vmcount'<br>-    - test: 'authenticate_nominal'<br>+    - test: 'authenticate_extensions'<br>     - test: 'authenticate_invalid_mailbox'<br>     - test: 'authenticate_invalid_password'<br>-    - test: 'authenticate_extensions'<br>-    - test: 'check_voicemail_nominal'<br>-    - test: 'check_voicemail_envelope'<br>+    - test: 'authenticate_nominal'<br>+    - test: 'check_voicemail_callback'<br>     - test: 'check_voicemail_delete'<br>-    - test: 'check_voicemail_new_user'<br>-    - test: 'check_voicemail_new_user_hangup'<br>-    - test: 'check_voicemail_options_record_busy'<br>-    - test: 'check_voicemail_options_record_unavail'<br>-    - test: 'check_voicemail_options_record_name'<br>-    - test: 'check_voicemail_options_record_temp'<br>-    - test: 'check_voicemail_options_change_password'<br>-    - test: 'check_voicemail_options_change_password_spooldir'<br>+    - test: 'check_voicemail_dialout'<br>+    - test: 'check_voicemail_envelope'<br>     - test: 'check_voicemail_forward'<br>     - test: 'check_voicemail_forward_hangup'<br>     - test: 'check_voicemail_forward_with_prepend'<br>-    - test: 'check_voicemail_callback'<br>-    - test: 'check_voicemail_dialout'<br>+    - test: 'check_voicemail_new_user'<br>+    - test: 'check_voicemail_new_user_hangup'<br>+    - test: 'check_voicemail_nominal'<br>+    - test: 'check_voicemail_options_change_password'<br>+    - test: 'check_voicemail_options_change_password_spooldir'<br>+    - test: 'check_voicemail_options_record_busy'<br>+    - test: 'check_voicemail_options_record_name'<br>+    - test: 'check_voicemail_options_record_temp'<br>+    - test: 'check_voicemail_options_record_unavail'<br>     - test: 'check_voicemail_reply'<br>     - test: 'check_voicemail_while_leaving_msg'<br>+    - test: 'func_vmcount'<br>+    - test: 'leave_voicemail_contexts'<br>+    - test: 'leave_voicemail_external_notification'<br>+    - test: 'leave_voicemail_forwarding'<br>+    - test: 'leave_voicemail_forwarding_auto_urgent'<br>+    - test: 'leave_voicemail_nominal'<br>+    - test: 'leave_voicemail_priority'<br>     - test: 'play_message'<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9228">change 9228</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9228"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: testsuite </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I753a1712504169634d6761db2343e5f3429872e9 </div>
<div style="display:none"> Gerrit-Change-Number: 9228 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>