Make sure Win32-like DBICTest checks are not tripped by repeated disconnects

[dbsrgits/DBIx-Class.git] / t / storage / base.t

diff --git a/t/storage/base.t b/t/storage/base.t
index efc5938..9a79e1f 100644 (file)
--- a/t/storage/base.t
+++ b/t/storage/base.t
@@ -25,6 +25,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 +180,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 +192,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');