X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F50fork.t;h=3ddcaf3017d63dab6a15e3508dbea03676136528;hb=5cbe5b1216f07b5e329f493bd8bdfa5b0aa0f5eb;hp=c5384c9b73bd018bc29c6fa6e7a2c6fc71be0a2f;hpb=199fbc453ec03891d0e156d7353c5e992ba4de47;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/50fork.t b/t/50fork.t
index c5384c9..3ddcaf3 100644
--- a/t/50fork.t
+++ b/t/50fork.t
@@ -1,8 +1,13 @@
 use strict;
 use warnings;
 use Test::More;
+
+use lib qw(t/lib);
+use DBICTest;
 use DBIx::Class::Optional::Dependencies ();
 
+my $main_pid = $$;
+
 plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('rdbms_pg')
   unless DBIx::Class::Optional::Dependencies->req_ok_for ('rdbms_pg');
 
@@ -18,13 +23,7 @@ if($num_children !~ /^[0-9]+$/ || $num_children < 10) {
    $num_children = 10;
 }
 
-plan tests => ($num_children*2) + 6;
-
-use lib qw(t/lib);
-
-use_ok('DBICTest::Schema');
-
-my $schema = DBICTest::Schema->connection($dsn, $user, $pass, { AutoCommit => 1 });
+my $schema = DBICTest::Schema->connect($dsn, $user, $pass, { AutoCommit => 1 });
 
 my $parent_rs;
 
@@ -117,4 +116,9 @@ while(@pids) {
 
 ok(1, "Made it to the end");
 
-$schema->storage->dbh->do("DROP TABLE cd");
+done_testing;
+
+END {
+  $schema->storage->dbh->do("DROP TABLE cd") if ($schema and $main_pid == $$);
+  undef $schema;
+}