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

(-)a/t/db_dependent/lib/KohaTest.pm (-2 / +1 lines)
Lines 713-724 sub create_test_database { Link Here
713
    diag 'creating testing database...';
713
    diag 'creating testing database...';
714
    my $installer = C4::Installer->new() or die 'unable to create new installer';
714
    my $installer = C4::Installer->new() or die 'unable to create new installer';
715
    # warn Data::Dumper->Dump( [ $installer ], [ 'installer' ] );
715
    # warn Data::Dumper->Dump( [ $installer ], [ 'installer' ] );
716
    my $all_languages = getAllLanguages();
717
    my $error = $installer->load_db_schema();
716
    my $error = $installer->load_db_schema();
718
    die "unable to load_db_schema: $error" if ( $error );
717
    die "unable to load_db_schema: $error" if ( $error );
719
    my $list = $installer->sql_file_list('en', 'marc21', { optional  => 1,
718
    my $list = $installer->sql_file_list('en', 'marc21', { optional  => 1,
720
                                                           mandatory => 1 } );
719
                                                           mandatory => 1 } );
721
    my ($fwk_language, $installed_list) = $installer->load_sql_in_order($all_languages, @$list);
720
    my ($fwk_language, $installed_list) = $installer->load_sql_in_order(@$list);
722
    $installer->set_version_syspref();
721
    $installer->set_version_syspref();
723
    $installer->set_marcflavour_syspref('MARC21');
722
    $installer->set_marcflavour_syspref('MARC21');
724
    diag 'database created.'
723
    diag 'database created.'
(-)a/t/db_dependent/lib/KohaTest/Installer/SqlScripts.pm (-3 / +1 lines)
Lines 20-26 sub installer_all_sample_data : Tests { Link Here
20
20
21
    skip "did not create installer" unless ref($self->{installer}) eq 'C4::Installer';
21
    skip "did not create installer" unless ref($self->{installer}) eq 'C4::Installer';
22
22
23
    my $all_languages = getAllLanguages();
24
    # find the available directory names
23
    # find the available directory names
25
    my $dir=C4::Context->config('intranetdir')."/installer/data/" . 
24
    my $dir=C4::Context->config('intranetdir')."/installer/data/" . 
26
            (C4::Context->config("db_scheme") ? C4::Context->config("db_scheme") : "mysql") . "/";
25
            (C4::Context->config("db_scheme") ? C4::Context->config("db_scheme") : "mysql") . "/";
Lines 48-54 sub installer_all_sample_data : Tests { Link Here
48
                    cmp_ok($sql_count, '>', 0, "at least one SQL init file for $lang_code, $flavour");
47
                    cmp_ok($sql_count, '>', 0, "at least one SQL init file for $lang_code, $flavour");
49
                    skip "no SQL init files defined for $lang_code, $flavour" unless $sql_count > 0;
48
                    skip "no SQL init files defined for $lang_code, $flavour" unless $sql_count > 0;
50
49
51
                    my ($fwk_language, $installed_list) = $self->{installer}->load_sql_in_order($all_languages, @$list);
50
                    my ($fwk_language, $installed_list) = $self->{installer}->load_sql_in_order(@$list);
52
51
53
                    # extract list of files
52
                    # extract list of files
54
                    my $level;
53
                    my $level;
55
- 

Return to bug 10509