View | Details | Raw Unified | Return to bug 15082
Collapse All | Expand All

(-)a/t/db_dependent/Search.t (-5 lines)
Lines 37-44 use Test::Warn; Link Here
37
use File::Temp qw/ tempdir /;
37
use File::Temp qw/ tempdir /;
38
use File::Path;
38
use File::Path;
39
39
40
use t::lib::Mocks;
41
42
our $child;
40
our $child;
43
our $datadir;
41
our $datadir;
44
42
Lines 84-92 sub cleanup { Link Here
84
    }
82
    }
85
}
83
}
86
84
87
BEGIN {
88
    t::lib::Mocks::mock_dbh;
89
}
90
# Fall back to make sure that the Zebra process
85
# Fall back to make sure that the Zebra process
91
# and files get cleaned up
86
# and files get cleaned up
92
END {
87
END {
(-)a/t/db_dependent/zebra_config.pl (-1 / +10 lines)
Lines 1-12 Link Here
1
#!/usr/bin/perl
1
#!/usr/bin/perl
2
2
3
use Modern::Perl;
3
use Modern::Perl;
4
4
use File::Copy;
5
use File::Copy;
5
use File::Path qw(make_path);
6
use File::Path qw(make_path);
6
use File::Find;
7
use File::Find;
7
use File::Basename;
8
use File::Basename;
8
use File::Spec;
9
use File::Spec;
9
10
11
use C4::Context;
12
10
my $source = File::Spec->rel2abs('.');
13
my $source = File::Spec->rel2abs('.');
11
my $destination = $ARGV[0];
14
my $destination = $ARGV[0];
12
my $marc_type = $ARGV[1] || 'marc21';
15
my $marc_type = $ARGV[1] || 'marc21';
Lines 48-53 make_path("$destination/var/run/zebradb"); Link Here
48
$ENV{'INSTALL_BASE'} = $destination;
51
$ENV{'INSTALL_BASE'} = $destination;
49
$ENV{'__INSTALL_BASE__'} = $destination;
52
$ENV{'__INSTALL_BASE__'} = $destination;
50
53
54
$ENV{'__DB_TYPE__'} = C4::Context->config('db_scheme') // 'mysql';
55
$ENV{'__DB_NAME__'} = C4::Context->config('database')  // 'koha';
56
$ENV{'__DB_HOST__'} = C4::Context->config('hostname')  // 'localhost';
57
$ENV{'__DB_PORT__'} = C4::Context->config('port')      // '3306';
58
$ENV{'__DB_USER__'} = C4::Context->config('user')      // 'kohaadmin';
59
$ENV{'__DB_PASS__'} = C4::Context->config('pass')      // 'katikoan';
60
51
my @files = ( "$source/etc/koha-conf.xml",
61
my @files = ( "$source/etc/koha-conf.xml",
52
              "$source/etc/searchengine/queryparser.yaml",
62
              "$source/etc/searchengine/queryparser.yaml",
53
            );
63
            );
54
- 

Return to bug 15082