X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F51threadtxn.t;h=74f6ce81ecb56b940d1eb60ff4177562740501a1;hb=4216833287bb50577b00bd690f33cea88f38fab1;hp=9908b8c828f61c9d530e06ebc0729f4733e65800;hpb=39fa10f57ca66b1c1e7a555bb07866b11bf54951;p=dbsrgits%2FDBIx-Class.git diff --git a/t/51threadtxn.t b/t/51threadtxn.t index 9908b8c..74f6ce8 100644 --- a/t/51threadtxn.t +++ b/t/51threadtxn.t @@ -8,29 +8,26 @@ use Config; BEGIN { plan skip_all => 'Your perl does not support ithreads' - if !$Config{useithreads} || $] < 5.008; + if !$Config{useithreads}; } use threads; +use lib qw(t/lib); my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_PG_${_}" } qw/DSN USER PASS/}; -my $num_children = $ENV{DBICTEST_THREAD_STRESS}; - -plan skip_all => 'Set $ENV{DBICTEST_THREAD_STRESS} to run this test' - 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); -diag 'It is normal to see a series of "Scalars leaked: ..." messages during this test'; + +my $num_children = $ENV{DBICTEST_THREAD_STRESS}; +plan skip_all => 'Set $ENV{DBICTEST_THREAD_STRESS} to run this test' + unless $num_children; if($num_children !~ /^[0-9]+$/ || $num_children < 10) { $num_children = 10; } -plan tests => $num_children + 5; - -use lib qw(t/lib); +diag 'It is normal to see a series of "Scalars leaked: ..." warnings during this test'; use_ok('DBICTest::Schema'); @@ -44,7 +41,7 @@ eval { { 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(255) NOT NULL UNIQUE, year VARCHAR(255));"); + $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);"); } $schema->resultset('CD')->create({ title => 'vacation in antarctica', artist => 123, year => 1901 }); @@ -93,3 +90,5 @@ while(@children) { ok(1, "Made it to the end"); $schema->storage->dbh->do("DROP TABLE cd"); + +done_testing;