package # hide from PAUSE
DBICTest;
+# load early so that `perl -It/lib -MDBICTest` keeps working
+use ANFANG;
+
use strict;
use warnings;
-use DBICTest::Util 'local_umask';
-use DBICTest::Schema;
+
+# this noop trick initializes the STDOUT, so that the TAP::Harness
+# issued IO::Select->can_read calls (which are blocking wtf wtf wtf)
+# keep spinning and scheduling jobs
+# This results in an overall much smoother job-queue drainage, since
+# the Harness blocks less
+# (ideally this needs to be addressed in T::H, but a quick patchjob
+# broke everything so tabling it for now)
+BEGIN {
+ # FIXME - there probably is some way to determine a harness run (T::H or
+ # prove) but I do not know it offhand, especially on older environments
+ # Go with the safer option
+ if ($INC{'Test/Builder.pm'}) {
+ local $| = 1;
+ print "#\n";
+ }
+}
+
+
+use DBICTest::Util qw(
+ local_umask slurp_bytes tmpdir await_flock
+ dbg DEBUG_TEST_CONCURRENCY_LOCKS PEEPEENESS
+);
use DBICTest::Util::LeakTracer qw/populate_weakregistry assert_empty_weakregistry/;
-use DBIx::Class::_Util 'detected_reinvoked_destructor';
+use DBICTest::Schema;
+use DBIx::Class::_Util qw( detected_reinvoked_destructor scope_guard );
use Carp;
-use Path::Class::File ();
-use File::Spec;
use Fcntl qw/:DEFAULT :flock/;
use Config;
=head1 SYNOPSIS
- use lib qw(t/lib);
- use DBICTest;
+ BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+
+ use warnings;
+ use strict;
use Test::More;
+ use DBICTest;
my $schema = DBICTest->init_schema();
sub import {
my $self = shift;
- my $lockpath = DBICTest::RunMode->tmpdir->file('_dbictest_global.lock');
+ my $lockpath = tmpdir . '_dbictest_global.lock';
{
my $u = local_umask(0); # so that the file opens as 666, and any user can lock
for my $exp (@_) {
if ($exp eq ':GlobalLock') {
- flock ($global_lock_fh, LOCK_EX) or die "Unable to lock $lockpath: $!";
+ DEBUG_TEST_CONCURRENCY_LOCKS > 1
+ and dbg "Waiting for EXCLUSIVE global lock...";
+
+ await_flock ($global_lock_fh, LOCK_EX) or die "Unable to lock $lockpath: $!";
+
+ DEBUG_TEST_CONCURRENCY_LOCKS > 1
+ and dbg "Got EXCLUSIVE global lock";
+
$global_exclusive_lock = 1;
}
elsif ($exp eq ':DiffSQL') {
}
unless ($global_exclusive_lock) {
- flock ($global_lock_fh, LOCK_SH) or die "Unable to lock $lockpath: $!";
- }
-}
+ DEBUG_TEST_CONCURRENCY_LOCKS > 1
+ and dbg "Waiting for SHARED global lock...";
-END {
- if ($global_lock_fh) {
- # delay destruction even more
+ await_flock ($global_lock_fh, LOCK_SH) or die "Unable to lock $lockpath: $!";
+
+ DEBUG_TEST_CONCURRENCY_LOCKS > 1
+ and dbg "Got SHARED global lock";
}
}
-{
- my $dir = Path::Class::File->new(__FILE__)->dir->parent->subdir('var');
- $dir->mkpath unless -d "$dir";
- $dir = "$dir";
+END {
+ # referencing here delays destruction even more
+ if ($global_lock_fh) {
+ DEBUG_TEST_CONCURRENCY_LOCKS > 1
+ and dbg "Release @{[ $global_exclusive_lock ? 'EXCLUSIVE' : 'SHARED' ]} global lock (END)";
+ 1;
+ }
- sub _sqlite_dbfilename {
- my $holder = $ENV{DBICTEST_LOCK_HOLDER} || $$;
- $holder = $$ if $holder == -1;
+ _cleanup_dbfile();
+}
- # useful for missing cleanup debugging
- #if ( $holder == $$) {
- # my $x = $0;
- # $x =~ s/\//#/g;
- # $holder .= "-$x";
- #}
+sub _sqlite_dbfilename {
+ my $holder = $ENV{DBICTEST_LOCK_HOLDER} || $$;
+ $holder = $$ if $holder == -1;
- return "$dir/DBIxClass-$holder.db";
- }
-
- END {
- _cleanup_dbfile();
- }
+ return "t/var/DBIxClass-$holder.db";
}
$SIG{INT} = sub { _cleanup_dbfile(); exit 1 };
+my $need_global_cleanup;
sub _cleanup_dbfile {
# cleanup if this is us
if (
or
$ENV{DBICTEST_LOCK_HOLDER} == $$
) {
+ if ($need_global_cleanup and my $dbh = DBICTest->schema->storage->_dbh) {
+ $dbh->disconnect;
+ }
+
my $db_file = _sqlite_dbfilename();
unlink $_ for ($db_file, "${db_file}-journal");
}
# set a *DBI* disconnect callback, to make sure the physical SQLite
# file is still there (i.e. the test does not attempt to delete
# an open database, which fails on Win32)
- if (my $guard_cb = __mk_disconnect_guard($db_file)) {
+ if (! $storage->{master} and my $guard_cb = __mk_disconnect_guard($db_file)) {
$dbh->{Callbacks} = {
connect => sub { $guard_cb->('connect') },
disconnect => sub { $guard_cb->('disconnect') },
return if (
# this perl leaks handles, delaying DESTROY, can't work right
- DBIx::Class::_ENV_::PEEPEENESS
+ PEEPEENESS
or
! -f $db_file
);
return;
}
elsif ($event eq 'disconnect') {
+ return unless $connected; # we already disconnected earlier
$connected = 0;
}
elsif ($event eq 'DESTROY' and ! $connected ) {
my $schema;
+ if (
+ $ENV{DBICTEST_VIA_REPLICATED} &&=
+ ( !$args{storage_type} && !defined $args{sqlite_use_file} )
+ ) {
+ $args{storage_type} = ['::DBI::Replicated', { balancer_type => '::Random' }];
+ $args{sqlite_use_file} = 1;
+ }
+
+ my @dsn = $self->_database(%args);
+
if ($args{compose_connection}) {
+ $need_global_cleanup = 1;
$schema = DBICTest::Schema->compose_connection(
- 'DBICTest', $self->_database(%args)
+ 'DBICTest', @dsn
);
} else {
$schema = DBICTest::Schema->compose_namespace('DBICTest');
}
if ( !$args{no_connect} ) {
- $schema = $schema->connect($self->_database(%args));
+ $schema->connection(@dsn);
+
+ $schema->storage->connect_replicants(\@dsn)
+ if $ENV{DBICTEST_VIA_REPLICATED};
}
if ( !$args{no_deploy} ) {
my $schema = shift;
my $args = shift || {};
- local $schema->storage->{debug}
- if ($ENV{TRAVIS}||'') eq 'true';
+ my $guard;
+ if ( ($ENV{TRAVIS}||'') eq 'true' and my $old_dbg = $schema->storage->debug ) {
+ $guard = scope_guard { $schema->storage->debug($old_dbg) };
+ $schema->storage->debug(0);
+ }
if ($ENV{"DBICTEST_SQLT_DEPLOY"}) {
$schema->deploy($args);
} else {
- my $filename = Path::Class::File->new(__FILE__)->dir
- ->file('sqlite.sql')->stringify;
- my $sql = do { local (@ARGV, $/) = $filename ; <> };
+ my $sql = slurp_bytes( 't/lib/sqlite.sql' );
for my $chunk ( split (/;\s*\n+/, $sql) ) {
if ( $chunk =~ / ^ (?! --\s* ) \S /xm ) { # there is some real sql in the chunk - a non-space at the start of the string which is not a comment
$schema->storage->dbh_do(sub { $_[1]->do($chunk) }) or print "Error on SQL: $chunk\n";
my $self = shift;
my $schema = shift;
- local $schema->storage->{debug}
- if ($ENV{TRAVIS}||'') eq 'true';
+ my $guard;
+ if ( ($ENV{TRAVIS}||'') eq 'true' and my $old_dbg = $schema->storage->debug ) {
+ $guard = scope_guard { $schema->storage->debug($old_dbg) };
+ $schema->storage->debug(0);
+ }
$schema->populate('Genre', [
[qw/genreid name/],
projects / dbsrgits/DBIx-Class.git / blobdiff