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.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@421125 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 1c163feb66bed5d95b8f3d06b60251264d45c821..668cddb1d271fa0091b6307df98e7ba6c5549a0e 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -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)) {

diff --git a/main/app.c b/main/app.c
index 6b4ebc380eb9990bc71c203cbfd7c81dd68fc77c..5eed249a61d160b7db64a3a8f45b8a23b40da185 100644 (file)
--- a/main/app.c
+++ b/main/app.c
@@ -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;
        }