X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstorage%2Fbase.t;h=b7650a8751766c4d565837ca3e5ae6f0862eddee;hb=5c505cafa292b25dbbfb0df53ac30e73069834a2;hp=efc593805a691383216eaa94a6c673a595fed112;hpb=37b5ab5186b53c5e786e32127d2589bd6dc9b3e0;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/storage/base.t b/t/storage/base.t
index efc5938..b7650a8 100644
--- a/t/storage/base.t
+++ b/t/storage/base.t
@@ -10,11 +10,13 @@ use Data::Dumper;
 
 my $schema = DBICTest->init_schema( sqlite_use_file => 1 );
 
-is( ref($schema->storage), 'DBIx::Class::Storage::DBI::SQLite',
-    'Storage reblessed correctly into DBIx::Class::Storage::DBI::SQLite' );
-
 my $storage = $schema->storage;
-$storage->ensure_connected;
+
+is(
+  ref($storage),
+  'DBIx::Class::Storage::DBI::SQLite',
+  'Storage reblessed correctly into DBIx::Class::Storage::DBI::SQLite'
+) unless $ENV{DBICTEST_VIA_REPLICATED};
 
 throws_ok {
     $schema->storage->throw_exception('test_exception_42');
@@ -25,6 +27,34 @@ throws_ok {
 } qr/prepare_cached failed/, 'exception via DBI->HandleError, etc';
 
 
+# make sure repeated disconnection works
+{
+  my $fn = DBICTest->_sqlite_dbfilename;
+
+  lives_ok {
+    $schema->storage->ensure_connected;
+    my $dbh = $schema->storage->dbh;
+    $schema->storage->disconnect for 1,2;
+    unlink $fn;
+    $dbh->disconnect;
+  };
+
+  lives_ok {
+    $schema->storage->ensure_connected;
+    $schema->storage->disconnect for 1,2;
+    unlink $fn;
+    $schema->storage->disconnect for 1,2;
+  };
+
+  lives_ok {
+    $schema->storage->ensure_connected;
+    $schema->storage->_dbh->disconnect;
+    unlink $fn;
+    $schema->storage->disconnect for 1,2;
+  };
+}
+
+
 # testing various invocations of connect_info ([ ... ])
 
 my $coderef = sub { 42 };
@@ -152,7 +182,7 @@ SKIP: for my $env_dsn (undef, (DBICTest->_database)[0] ) {
   skip 'Subtest relies on being connected to SQLite', 1
     if $env_dsn and $env_dsn !~ /\:SQLite\:/;
 
-  local $ENV{DBI_DSN} = $env_dsn;
+  local $ENV{DBI_DSN} = $env_dsn || '';
 
   my $s = DBICTest::Schema->connect();
   is_deeply (
@@ -164,7 +194,7 @@ SKIP: for my $env_dsn (undef, (DBICTest->_database)[0] ) {
 
   my $sm = $s->storage->sql_maker;
 
-  ok (! $s->storage->connected, 'Storage does not appear connected (SQLite determined by DSN-only analysis)');
+  ok (! $s->storage->connected, 'Storage does not appear connected after SQLMaker instance is taken');
 
   if ($env_dsn) {
     isa_ok($sm, 'DBIx::Class::SQLMaker');