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

diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm
index 2d5e238..c0c91c2 100644 (file)
--- a/t/lib/DBICTest.pm
+++ b/t/lib/DBICTest.pm
@@ -283,6 +283,7 @@ sub __mk_disconnect_guard {
       return;
     }
     elsif ($event eq 'disconnect') {
+      return unless $connected; # we already disconnected earlier
       $connected = 0;
     }
     elsif ($event eq 'DESTROY' and ! $connected ) {

diff --git a/t/storage/base.t b/t/storage/base.t
index 451f7e6..b7650a8 100644 (file)
--- a/t/storage/base.t
+++ b/t/storage/base.t
@@ -27,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 };
@@ -148,8 +176,6 @@ for my $type (keys %$invocations) {
   );
 }
 
-$schema->storage->_dbh->disconnect;
-
 # make sure connection-less storages do not throw on _determine_driver
 # but work with ENV at the same time
 SKIP: for my $env_dsn (undef, (DBICTest->_database)[0] ) {