@@ -, +, @@ --- t/lib/Bootstrap.pm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) --- a/t/lib/Bootstrap.pm +++ a/t/lib/Bootstrap.pm @@ -6,7 +6,7 @@ use DBI; use File::Temp qw( tempfile ); use XML::LibXML; -our $database; +our ( $database, $database_test ); sub import { my ($self, %args) = @_; @@ -15,7 +15,10 @@ sub import { my $host = C4::Context->config('hostname'); my $port = C4::Context->config('port'); - $database = C4::Context->config("database_test") || C4::Context->config('database'); + $database_test = C4::Context->config("database_test") or die "Config entry 'database_test' does not exist"; + $database = C4::Context->config('database'); + die "Entries 'database_test' and 'database' have the same value in your config" + if $database_test eq $database; my $user = C4::Context->config('user'); my $pass = C4::Context->config('pass'); @@ -24,14 +27,15 @@ sub import { PrintError => 0, }); - $dbh->do("DROP DATABASE IF EXISTS $database"); - $dbh->do("CREATE DATABASE $database"); + $dbh->do("DROP DATABASE IF EXISTS $database_test"); + $dbh->do("CREATE DATABASE $database_test"); } END { my $dbh = C4::Context->dbh; - $dbh->do("DROP DATABASE IF EXISTS $database") if $database; + $dbh->do("DROP DATABASE IF EXISTS $database_test") + if $database_test && $database_test ne $database; Koha::Caches->get_instance()->flush_all; Koha::Caches->get_instance('config')->flush_all; }; --