gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 28572: Set missing __LOG_DIR__ variable in zebra_config.pl 

This patch makes zebra_config.pl create a temporary directory for logs
and sets it in ENV so, when called, rewrite-config.PL sets it correctly.

It also adds the new syspref Reference_NFL_Statuses to the big mock to
silence many warnings introduced by bug 21260.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Tomas Cohen Arazi 2021-06-22 16:14:16 -03:00 committed by Jonathan Druart
parent 3d1a92b6e1
commit c2fb056d7d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/db_dependent/Search.t
View File

@ -192,6 +192,8 @@ $contextmodule->mock('preference', sub {
return '0';
} elsif ($pref eq 'OPACPlayMusicalInscripts') {
return '0';
} elsif ($pref eq 'Reference_NFL_Statuses') {
return '0';
} else {
warn "The syspref $pref was requested but I don't know what to say; this indicates that the test requires updating"
unless $pref =~ m/(XSLT|item|branch|holding|image)/i;

3
t/db_dependent/zebra_config.pl
View File

@ -36,6 +36,7 @@ make_path("$destination/var/lib/zebradb/authorities/key");
make_path("$destination/var/lib/zebradb/authorities/register");
make_path("$destination/var/lib/zebradb/authorities/shadow");
make_path("$destination/var/lib/zebradb/authorities/tmp");
make_path("$destination/var/log/koha");
make_path("$destination/var/run/zebradb");
$ENV{'INSTALL_BASE'} = $destination;
@ -48,6 +49,8 @@ $ENV{'__DB_PORT__'} = C4::Context->config('port') // '3306';
$ENV{'__DB_USER__'} = C4::Context->config('user') // 'kohaadmin';
$ENV{'__DB_PASS__'} = C4::Context->config('pass') // 'katikoan';
$ENV{'__LOG_DIR__'} = "$destination/var/log/koha";
my @files = (
"$source/etc/koha-conf.xml",
"$source/etc/log4perl.conf",