X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F52leaks.t;h=2f7041478063a31fb04e72ed30c4d30b16191f9a;hb=344f761ca18792709cd110bed7377f662abf1811;hp=da99c8b5e62eeb2fa376070c11d9192029b29022;hpb=218b7c12fa60ffdd37000b73b8ebca4c9d91a8a2;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/52leaks.t b/t/52leaks.t
index da99c8b..2f70414 100644
--- a/t/52leaks.t
+++ b/t/52leaks.t
@@ -262,7 +262,9 @@ my @compose_ns_classes;
 
   # this needs to fire, even if it can't find anything
   # see FIXME below
-  $rs_bind_circref->next;
+  # we run this only on smokers - trying to establish a pattern
+  $rs_bind_circref->next
+    if ( ($ENV{TRAVIS}||'') ne 'true' and DBICTest::RunMode->is_smoker);
 
   require Storable;
   %$base_collection = (
@@ -413,10 +415,8 @@ for my $moniker ( keys %{DBICTest::Schema->source_registrations || {}} ) {
 #          ^                                                           /
 #           \-------- bound value on prepared/cached STH  <-----------/
 #
-TODO: {
-  local $TODO = 'Not sure how to fix this yet, an entanglment could be an option';
-  my $r = $weak_registry->{'basic leaky_resultset_cond'}{weakref};
-  ok(! defined $r, 'We no longer leak!')
+if ( my $r = $weak_registry->{'basic leaky_resultset_cond'}{weakref} ) {
+  ok(! defined $r, 'Self-referential RS conditions no longer leak!')
     or $r->result_source(undef);
 }