Changeset 448

Timestamp:

07/01/08 17:11:41 (4 years ago)

Author:

kake

Message:

Use ->_dsn method in test 400 instead of rolling our own (probably fixes #35).

Location:

wiki-toolkit/trunk

Files:

• lib/Wiki/Toolkit/TestLib.pm (modified) (3 diffs)
• t/400_upgrade.t (modified) (1 diff)

wiki-toolkit/trunk/lib/Wiki/Toolkit/TestLib.pm

@@ -45 +45 @@
 my %datastore_info;
 
-my %dsn_prefix = ( MySQL  => "dbi:mysql:",
-                   Pg     => "dbi:Pg:dbname=",
-                   SQLite => "dbi:SQLite:dbname=");
-
 foreach my $dbtype (qw( MySQL Pg SQLite )) {
     if ( $configured{$dbtype}{dbname} ) {
@@ -54 +50 @@
         my $store_class = "Wiki::Toolkit::Store::$dbtype";
         my $setup_class = "Wiki::Toolkit::Setup::$dbtype";
-        my $dsn = $dsn_prefix{$dbtype}.$config{dbname};
+        eval "require $store_class";
+        if ( $@ ) {
+            warn "Couldn't require $store_class: $@\n";
+            warn "Will skip $dbtype tests.\n";
+            next;
+        }
+        my $dsn = $store_class->_dsn( @config{ qw( dbname dbhost dbport ) } );
         my $err;
-        if ($err = _test_dsn( $dsn, $config{dbuser}, $config{dbpass}, $config{dbhost})) {
+        if ( $err = _test_dsn( $dsn, $config{dbuser}, $config{dbpass} ) ) {
             warn "connecting to test $dbtype database failed: $err\n";
             warn "will skip $dbtype tests\n";
@@ -291 +293 @@
 
 sub _test_dsn {
-    my ( $dsn, $dbuser, $dbpass, $dbhost ) = @_;
-    $dsn .= ";host=$dbhost" if $dbhost;
+    my ( $dsn, $dbuser, $dbpass ) = @_;
     my $dbh = eval {
         DBI->connect($dsn, $dbuser, $dbpass, {RaiseError => 1});

wiki-toolkit/trunk/t/400_upgrade.t

@@ -68 +68 @@
 
         my $dsn = $database->{dsn};
-        $dsn .= ';dbhost=' . $params->{dbhost} if $params->{dbhost};
 
         my $dbh = DBI->connect($dsn, $params->{dbuser}, $params->{dbpass});