X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F52leaks.t;h=ad781acbbddd6b63e4d03e20c05e07abc532ee80;hb=1f870d5a08fa1794734380d7c8bd6753cdcf8f6d;hp=4625547c46476cf49544bb64af08079d8fafd2a3;hpb=a8c2c746a5bb98671cbe3a58f26cd115b7770cf9;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/52leaks.t b/t/52leaks.t
index 4625547..ad781ac 100644
--- a/t/52leaks.t
+++ b/t/52leaks.t
@@ -1,7 +1,22 @@
 use strict;
 use warnings;
 
+# Do the override as early as possible so that CORE::bless doesn't get compiled away
+# We will replace $bless_override only if we are in author mode
+my $bless_override;
+BEGIN {
+  $bless_override = sub {
+    CORE::bless( $_[0], (@_ > 1) ? $_[1] : caller() );
+  };
+  *CORE::GLOBAL::bless = sub { goto $bless_override };
+}
+
 use Test::More;
+BEGIN {
+  plan skip_all => '5.13.6 leaks like a sieve (fixed in blead/cefd5c7c)'
+    if $] == '5.013006';
+}
+
 use Scalar::Util qw/refaddr reftype weaken/;
 use Carp qw/longmess/;
 use Try::Tiny;
@@ -16,23 +31,27 @@ BEGIN {
     and import Test::Memory::Cycle;
 }
 
-# preload stuff so that we don't trap globals
-use DBI;
-use Errno;
-use Class::Struct;
-use DBD::SQLite;
-use FileHandle;
-
 # this is what holds all weakened refs to be checked for leakage
 my $weak_registry = {};
 
 # Skip the heavy-duty leak tracing when just doing an install
 unless (DBICTest::RunMode->is_plain) {
+
+  # Some modules are known to install singletons on-load
+  # Load them before we swap out $bless_override
+  require DBI;
+  require DBD::SQLite;
+  require Errno;
+  require Class::Struct;
+  require FileHandle;
+  require Hash::Merge;
+
   no warnings qw/redefine once/;
   no strict qw/refs/;
 
-  # override bless so that we can catch each and every object created
-  *CORE::GLOBAL::bless = sub {
+  # redefine the bless override so that we can catch each and every object created
+  $bless_override = sub {
+
     my $obj = CORE::bless(
       $_[0], (@_ > 1) ? $_[1] : do {
         my ($class, $fn, $line) = caller();
@@ -108,6 +127,7 @@ unless (DBICTest::RunMode->is_plain) {
     storage => $storage,
 
     resultset => $rs,
+
     row_object => $row_obj,
 
     result_source => $rs->result_source,
@@ -133,6 +153,25 @@ unless (DBICTest::RunMode->is_plain) {
 memory_cycle_ok($weak_registry, 'No cycles in the weakened object collection')
   if $have_test_cycle;
 
+# Naturally we have some exceptions
+my $cleared;
+for my $slot (keys %$weak_registry) {
+  if ($slot =~ /^\QSQL::Translator/) {
+    # SQLT is a piece of shit, leaks all over
+    delete $weak_registry->{$slot};
+  }
+  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};
+  }
+}
+
+
 # FIXME
 # For reasons I can not yet fully understand the table() god-method (located in
 # ::ResultSourceProxy::Table) attaches an actual source instance to each class
@@ -151,8 +190,6 @@ DBICTest::Schema->source_registrations(undef);
 
 my $tb = Test::More->builder;
 for my $slot (keys %$weak_registry) {
-  # SQLT is a piece of shit, leaks all over
-  next if $slot =~ /^SQL\:\:Translator/;
 
   ok (! defined $weak_registry->{$slot}{weakref}, "No leaks of $slot") or do {
     my $diag = '';