X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F52leaks.t;h=792c3d331ef06eceb93bfe5ebc7bc689b6f5b6a8;hb=d5e5fb4b47b759b202e552ff1d2f1dd393ac7b39;hp=f779f3c11acb5ac3fd6126b51d9d6d669f62d415;hpb=307ab4c58566698710b71eebbfb612686d9133be;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/52leaks.t b/t/52leaks.t
index f779f3c..792c3d3 100644
--- a/t/52leaks.t
+++ b/t/52leaks.t
@@ -12,12 +12,17 @@ BEGIN {
 }
 
 use Test::More;
-use Scalar::Util qw/refaddr reftype weaken/;
-use Carp qw/longmess/;
-use Try::Tiny;
 
 use lib qw(t/lib);
 use DBICTest::RunMode;
+BEGIN {
+  plan skip_all => "Your perl version $] appears to leak like a sieve - skipping test"
+    if DBICTest::RunMode->peepeeness;
+}
+
+use Scalar::Util qw/refaddr reftype weaken/;
+use Carp qw/longmess/;
+use Try::Tiny;
 
 my $have_test_cycle;
 BEGIN {
@@ -151,15 +156,23 @@ memory_cycle_ok($weak_registry, 'No cycles in the weakened object collection')
 # Naturally we have some exceptions
 my $cleared;
 for my $slot (keys %$weak_registry) {
-  if ($slot =~ /^SQL\:\:Translator/) {
+  if ($slot =~ /^\QTest::Builder/) {
+    # T::B 2.0 has result objects and other fancyness
+    delete $weak_registry->{$slot};
+  }
+  elsif ($slot =~ /^\QSQL::Translator/) {
     # SQLT is a piece of shit, leaks all over
     delete $weak_registry->{$slot};
   }
-  elsif ($slot =~ /^Hash\:\:Merge/) {
+  elsif ($slot =~ /^\QHash::Merge/) {
     # only clear one object - more would indicate trouble
     delete $weak_registry->{$slot}
       unless $cleared->{hash_merge_singleton}{$weak_registry->{$slot}{weakref}{behavior}}++;
   }
+  elsif ($slot =~ /^__TxnScopeGuard__FIXUP__/) {
+    die 'The $@ debacle should have been fixed by now!!!' if $] >= 5.013008;
+    delete $weak_registry->{$slot};
+  }
 }