kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 03:18:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

app_voicemail/app: Remove test events that were duplicated by r421059

Browse Source 
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.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@421125 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2014-08-15 14:43:44 +00:00
parent 9c477681f1
commit 5ee6da4cf2
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_voicemail.c
View File

@@ -7296,7 +7296,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", chan->language); /* "extension" */
prompt_played++;
if (res || prompt_played > 4)
@@ -9820,7 +9819,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", chan->language)) {
ast_log(AST_LOG_WARNING, "Couldn't stream login file\n");
return -1;
@@ -9868,7 +9866,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, chan->language)) {
ast_log(AST_LOG_WARNING, "Unable to stream password file\n");
return -1;
@@ -9905,13 +9902,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", chan->language)) {
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", chan->language)) {

1
main/app.c
View File

@@ -823,7 +823,6 @@ int ast_play_and_wait(struct ast_channel *chan, const char *fn)
{
int d = 0;
ast_test_suite_event_notify("PLAYBACK", "Message: %s", fn);
if ((d = ast_streamfile(chan, fn, chan->language))) {
return d;
}