From: Peter Rabbitson <ribasushi@cpan.org>
Date: Fri, 22 Jan 2016 13:14:58 +0000 (+0100)
Subject: Make sure Win32-like DBICTest checks are not tripped by repeated disconnects
X-Git-Tag: v0.082840~29
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=504d192f5ace8bd5a5c77867808020af2a9317d8;p=dbsrgits%2FDBIx-Class.git

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

( cherry pick of 5c505caf )
---

diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm
index 35a9e0c..936834e 100644
--- a/t/lib/DBICTest.pm
+++ b/t/lib/DBICTest.pm
@@ -284,6 +284,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 1861855..9a79e1f 100644
--- 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 };
@@ -146,8 +174,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] ) {