X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F33storage_reconnect.t;h=8f1eba15a7c5f46320428b9df44232b180173096;hb=c98169a74e44ef761b38d738d1d16f8a693d0a46;hp=e95f1879168ed5b2282241854110a92f11d4a760;hpb=5b8cee5c4a675888bc531aee20326cc2100721b6;p=dbsrgits%2FDBIx-Class.git diff --git a/t/33storage_reconnect.t b/t/33storage_reconnect.t index e95f187..8f1eba1 100644 --- a/t/33storage_reconnect.t +++ b/t/33storage_reconnect.t @@ -13,7 +13,7 @@ my $db_orig = "$FindBin::Bin/var/DBIxClass.db"; my $db_tmp = "$db_orig.tmp"; # Set up the "usual" sqlite for DBICTest -my $schema = DBICTest->init_schema; +my $schema = DBICTest->init_schema( sqlite_use_file => 1 ); # Make sure we're connected by doing something my @art = $schema->resultset("Artist")->search({ }, { order_by => 'name DESC'}); @@ -21,12 +21,11 @@ cmp_ok(@art, '==', 3, "Three artists returned"); # Disconnect the dbh, and be sneaky about it # Also test if DBD::SQLite finaly knows how to ->disconnect properly -TODO: { - local $TODO = 'SQLite is evil/braindead. Once this test starts passing, remove the related atrocity from DBIx::Class::Storage::DBI::disconnect()'; - my $w; - local $SIG{__WARN__} = sub { $w = shift }; - $schema->storage->_dbh->disconnect; - ok ($w !~ /active statement handles/, 'SQLite can disconnect properly \o/'); +{ + my $w; + local $SIG{__WARN__} = sub { $w = shift }; + $schema->storage->_dbh->disconnect; + ok ($w !~ /active statement handles/, 'SQLite can disconnect properly'); } # Try the operation again - What should happen here is: @@ -48,7 +47,7 @@ chmod 0000, $db_orig; ### Try the operation again... it should fail, since there's no db { - # Catch the DBI connection error (disabling PrintError entirely is unwise) + # Catch the DBI connection error local $SIG{__WARN__} = sub {}; eval { my @art_three = $schema->resultset("Artist")->search( {}, { order_by => 'name DESC' } );