use base qw(DBICTest::Base DBIx::Class::Schema);
use Fcntl qw(:DEFAULT :seek :flock);
-use Time::HiRes 'sleep';
+use IO::Handle ();
use DBIx::Class::_Util 'scope_guard';
use DBICTest::Util::LeakTracer qw(populate_weakregistry assert_empty_weakregistry);
-use DBICTest::Util qw( local_umask await_flock dbg DEBUG_TEST_CONCURRENCY_LOCKS );
+use DBICTest::Util qw( local_umask tmpdir await_flock dbg DEBUG_TEST_CONCURRENCY_LOCKS );
use namespace::clean;
+if( $ENV{DBICTEST_ASSERT_NO_SPURIOUS_EXCEPTION_ACTION} ) {
+ my $ea = __PACKAGE__->exception_action( sub {
+
+ # Can not rely on $^S here at all - the exception_action
+ # itself is always called in an eval so that the goto-guard
+ # can work (see 7cb35852)
+
+ my ( $fr_num, $disarmed, $throw_exception_fr_num, $eval_fr_num );
+ while( ! $disarmed and my @fr = caller(++$fr_num) ) {
+
+ $throw_exception_fr_num ||= (
+ $fr[3] =~ /^DBIx::Class::(?:ResultSource|Schema|Storage|Exception)::throw(?:_exception)?$/
+ and
+ # there may be evals in the throwers themselves - skip those
+ ( $eval_fr_num ) = ( undef )
+ and
+ $fr_num
+ );
+
+ # now that the above stops un-setting us, we can find the first
+ # ineresting eval
+ $eval_fr_num ||= (
+ $fr[3] eq '(eval)'
+ and
+ $fr_num
+ );
+
+ $disarmed = !! (
+ $fr[1] =~ / \A (?: \. [\/\\] )? x?t [\/\\] .+ \.t \z /x
+ and
+ (
+ $fr[3] =~ /\A (?:
+ Test::Exception::throws_ok
+ |
+ Test::Exception::dies_ok
+ |
+ Try::Tiny::try
+ |
+ \Q(eval)\E
+ ) \z /x
+ or
+ (
+ $fr[3] eq 'Test::Exception::lives_ok'
+ and
+ ( $::TODO or Test::Builder->new->in_todo )
+ )
+ )
+ );
+ }
+
+ Test::Builder->new->ok(0, join "\n",
+ 'Unexpected &exception_action invocation',
+ '',
+ ' You almost certainly used eval/try instead of dbic_internal_try()',
+ " Adjust *one* of the eval-ish constructs in the callstack starting" . DBICTest::Util::stacktrace($throw_exception_fr_num||())
+ ) if (
+ ! $disarmed
+ and
+ (
+ $eval_fr_num
+ or
+ ! $throw_exception_fr_num
+ )
+ );
+
+ DBIx::Class::Exception->throw( $_[0] );
+ });
+
+ my $interesting_ns_rx = qr/^ (?: main$ | DBIx::Class:: | DBICTest:: ) /x;
+
+ # hard-set $SIG{__DIE__} to the class-wide exception_action
+ # with a little escape preceeding it
+ $SIG{__DIE__} = sub {
+
+ # without this there would be false positives everywhere :(
+ die @_ if (
+ # blindly rethrow if nobody is waiting for us
+ ( defined $^S and ! $^S )
+ or
+ (caller(0))[0] !~ $interesting_ns_rx
+ or
+ (
+ caller(0) eq 'main'
+ and
+ (caller(1))[0] !~ $interesting_ns_rx
+ )
+ );
+
+ &$ea;
+ };
+}
+
sub capture_executed_sql_bind {
my ($self, $cref) = @_;
and
ref($_[0]) ne 'CODE'
and
- ($_[0]||'') !~ /^ (?i:dbi) \: SQLite \: (?: dbname\= )? (?: \:memory\: | t [\/\\] var [\/\\] DBIxClass\-) /x
+ ($_[0]||'') !~ /^ (?i:dbi) \: SQLite (?: \: | \W ) .*? (?: dbname\= )? (?: \:memory\: | t [\/\\] var [\/\\] DBIxClass\-) /x
) {
my $locktype;
# we need to work with a forced fresh clone so that we do not upset any state
# of the main $schema (some tests examine it quite closely)
local $SIG{__WARN__} = sub {};
+ local $SIG{__DIE__} if $SIG{__DIE__};
local $@;
# this will either give us an undef $locktype or will determine things
# properly with a default ( possibly connecting in the process )
eval {
- my $s = ref($self)->connect(@{$self->storage->connect_info})->storage;
+ my $cur_storage = $self->storage;
+
+ $cur_storage = $cur_storage->master
+ if $cur_storage->isa('DBIx::Class::Storage::DBI::Replicated');
+
+ my $s = ref($self)->connect(@{$cur_storage->connect_info})->storage;
$locktype = $s->sqlt_type || 'generic';
undef $locker;
- my $lockpath = DBICTest::RunMode->tmpdir->file("_dbictest_$locktype.lock");
+ my $lockpath = tmpdir . "_dbictest_$locktype.lock";
DEBUG_TEST_CONCURRENCY_LOCKS
and dbg "Waiting for $locktype LOCK: $lockpath...";
for (1..50) {
kill (0, $old_pid) or last;
- sleep 0.1;
+ select( undef, undef, undef, 0.1 );
}
DEBUG_TEST_CONCURRENCY_LOCKS