X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F52leaks.t;h=4923be01d2aa4358bb77c6da21fbfcccd7581876;hb=8fa57d17d30acafcdde55238ae5355b58e0c60e2;hp=9f8c71a8c2f2464c180d8a07a7b67480d64576b6;hpb=a4c52abc098ab090dfcfe6412cf106f2c7139e7e;p=dbsrgits%2FDBIx-Class.git diff --git a/t/52leaks.t b/t/52leaks.t index 9f8c71a..4923be0 100644 --- a/t/52leaks.t +++ b/t/52leaks.t @@ -50,7 +50,6 @@ use DBICTest::RunMode; use DBICTest::Util::LeakTracer qw/populate_weakregistry assert_empty_weakregistry/; use Scalar::Util 'refaddr'; use DBIx::Class; -use B 'svref_2object'; BEGIN { plan skip_all => "Your perl version $] appears to leak like a sieve - skipping test" if DBIx::Class::_ENV_::PEEPEENESS; @@ -117,7 +116,6 @@ unless (DBICTest::RunMode->is_plain) { %$weak_registry = (); } -my @compose_ns_classes; { use_ok ('DBICTest'); @@ -125,8 +123,6 @@ my @compose_ns_classes; my $rs = $schema->resultset ('Artist'); my $storage = $schema->storage; - @compose_ns_classes = map { "DBICTest::${_}" } keys %{$schema->source_registrations}; - ok ($storage->connected, 'we are connected'); my $row_obj = $rs->search({}, { rows => 1})->next; # so that commits/rollbacks work @@ -385,34 +381,6 @@ for my $slot (keys %$weak_registry) { } } -# every result class has a result source instance as classdata -# make sure these are all present and distinct before ignoring -# (distinct means only 1 reference) -for my $rs_class ( - 'DBICTest::BaseResult', - @compose_ns_classes, - map { DBICTest::Schema->class ($_) } DBICTest::Schema->sources -) { - # need to store the SVref and examine it separately, to push the rsrc instance off the pad - my $SV = svref_2object($rs_class->result_source_instance); - is( $SV->REFCNT, 1, "Source instance of $rs_class referenced exactly once" ); - - # ignore it - delete $weak_registry->{$rs_class->result_source_instance}; -} - -# Schema classes also hold sources, but these are clones, since -# each source contains the schema (or schema class name in this case) -# Hence the clone so that the same source can be registered with -# multiple schemas -for my $moniker ( keys %{DBICTest::Schema->source_registrations || {}} ) { - - my $SV = svref_2object(DBICTest::Schema->source($moniker)); - is( $SV->REFCNT, 1, "Source instance registered under DBICTest::Schema as $moniker referenced exactly once" ); - - delete $weak_registry->{DBICTest::Schema->source($moniker)}; -} - # FIXME !!! # There is an actual strong circular reference taking place here, but because # half of it is in XS no leaktracer sees it, and Devel::FindRef is equally