tests: use datadir for sound files
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>
Sat, 21 Jan 2017 20:43:48 +0000 (22:43 +0200)
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>
Sat, 21 Jan 2017 23:52:21 +0000 (01:52 +0200)
Some (voicemail-related) tests API symlinks beep.gsm and other files
from ast_config_AST_VAR_DIR. It should use ast_config_AST_DATA_DIR.

ASTERISK-26740 #close

Change-Id: Id49c56fb9e16df64b1a2b829693ca7601252df89

apps/app_voicemail.c
tests/test_voicemail_api.c

index 03273c6..37f8aa9 100644 (file)
@@ -14393,7 +14393,7 @@ AST_TEST_DEFINE(test_voicemail_vmsayname)
                                ast_log(AST_LOG_WARNING, "Failed to make test directory\n");
                                goto exit_vmsayname_test;
                        }
-                       snprintf(dir, sizeof(dir), "%s/sounds/beep.gsm", ast_config_AST_VAR_DIR);
+                       snprintf(dir, sizeof(dir), "%s/sounds/beep.gsm", ast_config_AST_DATA_DIR);
                        snprintf(dir2, sizeof(dir2), "%s%s/%s/greet.gsm", VM_SPOOL_DIR, TEST_CONTEXT, TEST_EXTENSION);
                        /* we're not going to hear the sound anyway, just use a valid gsm audio file */
                        if ((res = symlink(dir, dir2))) {
@@ -14639,8 +14639,8 @@ AST_TEST_DEFINE(test_voicemail_notify_endl)
                break;
        }
 
-       snprintf(attach, sizeof(attach), "%s/sounds/en/tt-weasels", ast_config_AST_VAR_DIR);
-       snprintf(attach2, sizeof(attach2), "%s/sounds/en/tt-somethingwrong", ast_config_AST_VAR_DIR);
+       snprintf(attach, sizeof(attach), "%s/sounds/en/tt-weasels", ast_config_AST_DATA_DIR);
+       snprintf(attach2, sizeof(attach2), "%s/sounds/en/tt-somethingwrong", ast_config_AST_DATA_DIR);
 
        if (!(vmu = find_user(&vmus, testcontext, testmailbox)) &&
                !(vmu = find_or_create(testcontext, testmailbox))) {
index 9cadf23..77b538e 100644 (file)
@@ -460,7 +460,7 @@ static int test_vm_api_create_voicemail_files(const char *context, const char *m
                folder_path, snapshot->msg_number);
        snprintf(snd_path, sizeof(snd_path), "%s/msg%04u.gsm",
                folder_path, snapshot->msg_number);
-       snprintf(beep_path, sizeof(beep_path), "%s/sounds/en/beep.gsm", ast_config_AST_VAR_DIR);
+       snprintf(beep_path, sizeof(beep_path), "%s/sounds/en/beep.gsm", ast_config_AST_DATA_DIR);
 
        if (test_vm_api_create_voicemail_folder(folder_path)) {
                return 1;