diff options
| author | Matthew Jordan <mjordan@digium.com> | 2014-08-15 15:45:27 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2014-08-15 15:45:27 +0000 |
| commit | 544e092b2db48c59a0f22e4a64ad307d91e585f3 (patch) | |
| tree | c1e7a3e6ed498029707a9d8fe2abec6bbe608513 /apps/app_voicemail.c | |
| parent | cce3d9ec5c968dbc04c0939aa7ef19972fa8d257 (diff) | |
app_voicemail/app: Remove test events that were duplicated by r421059
Moving the test event raised when a file is played back (which occurred in
r421059) broke the ever loving snot out of the voicemail tests. This caused
duplicate test events to get raised, as app_voicemail and main/app were raising
events prior to call ast_streamfile. The voicemail tests did not enjoy getting
multiple events.
Since raising the playback event in ast_streamfile is far more useful to the
vast majority of tests, this patch keeps the call there and simply removes the
extraneous calls that duplicated the event.
........
Merged revisions 421125 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 421164 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 421165 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@421166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_voicemail.c')
| -rw-r--r-- | apps/app_voicemail.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index c3cf36f24..fdfbf2255 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -8099,7 +8099,6 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st } } else { /* Ask for an extension */ - ast_test_suite_event_notify("PLAYBACK", "Message: vm-extension"); res = ast_streamfile(chan, "vm-extension", ast_channel_language(chan)); /* "extension" */ prompt_played++; if (res || prompt_played > 4) @@ -10836,7 +10835,6 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_ adsi_begin(chan, &useadsi); if (!skipuser && useadsi) adsi_login(chan); - ast_test_suite_event_notify("PLAYBACK", "Message: vm-login"); if (!silent && !skipuser && ast_streamfile(chan, "vm-login", ast_channel_language(chan))) { ast_log(AST_LOG_WARNING, "Couldn't stream login file\n"); return -1; @@ -10884,7 +10882,6 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_ /* saved password is blank, so don't bother asking */ password[0] = '\0'; } else { - ast_test_suite_event_notify("PLAYBACK", "Message: %s", vm_password); if (ast_streamfile(chan, vm_password, ast_channel_language(chan))) { ast_log(AST_LOG_WARNING, "Unable to stream password file\n"); return -1; @@ -10921,13 +10918,11 @@ static int vm_authenticate(struct ast_channel *chan, char *mailbox, int mailbox_ logretries++; if (!valid) { if (skipuser || logretries >= max_logins) { - ast_test_suite_event_notify("PLAYBACK", "Message: vm-incorrect"); if (ast_streamfile(chan, "vm-incorrect", ast_channel_language(chan))) { ast_log(AST_LOG_WARNING, "Unable to stream incorrect message\n"); return -1; } } else { - ast_test_suite_event_notify("PLAYBACK", "Message: vm-incorrect-mailbox"); if (useadsi) adsi_login(chan); if (ast_streamfile(chan, "vm-incorrect-mailbox", ast_channel_language(chan))) { |