Even better localization of $@, and don't use Test::Warn for the time being, as somet...

[dbsrgits/DBIx-Class.git] / t / 81transactions.t

diff --git a/t/81transactions.t b/t/81transactions.t
index 1028e7f..c1300de 100644 (file)
--- a/t/81transactions.t
+++ b/t/81transactions.t
@@ -329,23 +329,49 @@ $schema->storage->disconnect;
   }, qr/Deliberate exception.+Rollback failed/s);
 }
 
-# make sure it warns and dies on failed rollbacks
-TODO: {
+# make sure it warns *big* on failed rollbacks
+{
   my $schema = DBICTest->init_schema();
 
-  local $TODO = "Can't die in DESTROY :(";
-
-  throws_ok (sub {
-    warnings_exist (sub {
+  # something is really confusing Test::Warn here, no time to debug
+=begin
+  warnings_exist (
+    sub {
       my $guard = $schema->txn_scope_guard;
       $schema->resultset ('Artist')->create ({ name => 'bohhoo'});
 
       $schema->storage->disconnect;  # this should freak out the guard rollback
-
     },
+    [
+      qr/A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or error. Rolling back./,
+      qr/\*+ ROLLBACK FAILED\!\!\! \*+/,
+    ],
+    'proper warnings generated on out-of-scope+rollback failure'
+  );
+=cut
+
+  my @want = (
     qr/A DBIx::Class::Storage::TxnScopeGuard went out of scope without explicit commit or error. Rolling back./,
-    'out-of-scope warning');
-  }, qr/Rollback failed:/, 'rollback error thrown' );
+    qr/\*+ ROLLBACK FAILED\!\!\! \*+/,
+  );
+
+  my @w;
+  local $SIG{__WARN__} = sub {
+    if (grep {$_[0] =~ $_} (@want)) {
+      push @w, $_[0];
+    }
+    else {
+      warn $_[0];
+    }
+  };
+  {
+      my $guard = $schema->txn_scope_guard;
+      $schema->resultset ('Artist')->create ({ name => 'bohhoo'});
+
+      $schema->storage->disconnect;  # this should freak out the guard rollback
+  }
+
+  is (@w, 2, 'Both expected warnings found');
 }
 
 done_testing;