X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F50fork.t;h=8fea72f51e731450e7e276a26c393c62d73684b5;hb=64ae166780d0cb2b9577e506da9b9b240c146d20;hp=79ba7a65c56d44dd6ae272ac0cbffcc997149fc1;hpb=6adfd46229f02958ef8e163ef973b827e123bf14;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/50fork.t b/t/50fork.t
index 79ba7a6..8fea72f 100644
--- a/t/50fork.t
+++ b/t/50fork.t
@@ -1,47 +1,67 @@
-use Class::C3;
 use strict;
-use Test::More;
 use warnings;
+use Test::More;
 
-# This test passes no matter what in most cases.  However, prior to the recent
-# fork-related fixes, it would spew lots of warnings.  I have not quite gotten
-# it to where it actually fails in those cases.
+# README: If you set the env var to a number greater than 10,
+#   we will use that many children
 
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_PG_${_}" } qw/DSN USER PASS/};
+my $num_children = $ENV{DBICTEST_FORK_STRESS};
 
 plan skip_all => 'Set $ENV{DBICTEST_FORK_STRESS} to run this test'
-    unless $ENV{DBICTEST_FORK_STRESS};
+    unless $num_children;
 
 plan skip_all => 'Set $ENV{DBICTEST_PG_DSN}, _USER and _PASS to run this test'
       . ' (note: creates and drops a table named artist!)' unless ($dsn && $user);
 
-plan tests => 15;
+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');
 
-DBICTest::Schema->compose_connection('PgTest' => $dsn, $user, $pass, { AutoCommit => 1 });
+my $schema = DBICTest::Schema->connection($dsn, $user, $pass, { AutoCommit => 1 });
 
-my ($first_rs, $joe_record);
+my $parent_rs;
 
 eval {
-    my $dbh = PgTest->schema->storage->dbh;
+    my $dbh = $schema->storage->dbh;
 
-    eval {
-        $dbh->do("DROP TABLE cd");
-        $dbh->do("CREATE TABLE cd (cdid serial PRIMARY KEY, artist INTEGER NOT NULL UNIQUE, title VARCHAR(255) NOT NULL UNIQUE, year VARCHAR(255));");
-    };
+    {
+        local $SIG{__WARN__} = sub {};
+        eval { $dbh->do("DROP TABLE cd") };
+        $dbh->do("CREATE TABLE cd (cdid serial PRIMARY KEY, artist INTEGER NOT NULL UNIQUE, title VARCHAR(100) NOT NULL UNIQUE, year VARCHAR(100) NOT NULL, genreid INTEGER, single_track INTEGER);");
+    }
 
-    PgTest->resultset('CD')->create({ title => 'vacation in antarctica', artist => 123, year => 1901 });
-    PgTest->resultset('CD')->create({ title => 'vacation in antarctica part 2', artist => 456, year => 1901 });
+    $schema->resultset('CD')->create({ title => 'vacation in antarctica', artist => 123, year => 1901 });
+    $schema->resultset('CD')->create({ title => 'vacation in antarctica part 2', artist => 456, year => 1901 });
 
-    $first_rs = PgTest->resultset('CD')->search({ year => 1901 });
-    $joe_record = $first_rs->next;
+    $parent_rs = $schema->resultset('CD')->search({ year => 1901 });
+    $parent_rs->next;
 };
 ok(!$@) or diag "Creation eval failed: $@";
 
-my $num_children = 10;
+{
+    my $pid = fork;
+    if(!defined $pid) {
+        die "fork failed: $!";
+    }
+
+    if (!$pid) {
+        exit $schema->storage->connected ? 1 : 0;
+    }
+
+    if (waitpid($pid, 0) == $pid) {
+        my $ex = $? >> 8;
+        ok($ex == 0, "storage->connected() returns false in child");
+        exit $ex if $ex; # skip remaining tests
+    }
+}
+
 my @pids;
 while(@pids < $num_children) {
 
@@ -51,33 +71,50 @@ while(@pids < $num_children) {
     }
     elsif($pid) {
         push(@pids, $pid);
-	next;
+        next;
     }
 
     $pid = $$;
-    my ($forked_rs, $joe_forked);
 
-    $forked_rs = PgTest->resultset('CD')->search({ year => 1901 });
-    $joe_forked = $first_rs->next;
-    if($joe_forked && $joe_forked->get_column('artist') =~ /^(?:123|456)$/) {
-        PgTest->resultset('CD')->create({ title => "test success $pid", artist => $pid, year => scalar(@pids) });
+    my $work = sub {
+      my $child_rs = $schema->resultset('CD')->search({ year => 1901 });
+      my $row = $parent_rs->next;
+      $schema->resultset('CD')->create({ title => "test success $pid", artist => $pid, year => scalar(@pids) })
+        if($row && $row->get_column('artist') =~ /^(?:123|456)$/);
+    };
+
+    # try with and without transactions
+    if ((@pids % 3) == 1) {
+      my $guard = $schema->txn_scope_guard;
+      $work->();
+      $guard->commit;
+    }
+    elsif ((@pids % 3) == 2) {
+      $schema->txn_do ($work);
+    }
+    else {
+      $work->();
     }
+
     sleep(3);
-    exit;
+    exit 0;
 }
 
 ok(1, "past forking");
 
-waitpid($_,0) for(@pids);
+for (@pids) {
+  waitpid($_,0);
+  ok (! $?, "Child $_ exitted cleanly");
+};
 
 ok(1, "past waiting");
 
 while(@pids) {
     my $pid = pop(@pids);
-    my $rs = PgTest->resultset('CD')->search({ title => "test success $pid", artist => $pid, year => scalar(@pids) });
+    my $rs = $schema->resultset('CD')->search({ title => "test success $pid", artist => $pid, year => scalar(@pids) });
     is($rs->next->get_column('artist'), $pid, "Child $pid successful");
 }
 
 ok(1, "Made it to the end");
 
-PgTest->schema->storage->dbh->do("DROP TABLE cd");
+$schema->storage->dbh->do("DROP TABLE cd");