use strict;
use warnings;
-use DBICTest::Util qw( local_umask dbg DEBUG_TEST_CONCURRENCY_LOCKS );
+use DBICTest::Util qw( local_umask await_flock dbg DEBUG_TEST_CONCURRENCY_LOCKS );
use DBICTest::Schema;
use DBICTest::Util::LeakTracer qw/populate_weakregistry assert_empty_weakregistry/;
-use DBIx::Class::_Util 'detected_reinvoked_destructor';
+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;
-use Scope::Guard ();
=head1 NAME
DEBUG_TEST_CONCURRENCY_LOCKS > 1
and dbg "Waiting for EXCLUSIVE global lock...";
- flock ($global_lock_fh, LOCK_EX) or die "Unable to lock $lockpath: $!";
+ await_flock ($global_lock_fh, LOCK_EX) or die "Unable to lock $lockpath: $!";
DEBUG_TEST_CONCURRENCY_LOCKS > 1
and dbg "Got EXCLUSIVE global lock";
DEBUG_TEST_CONCURRENCY_LOCKS > 1
and dbg "Waiting for SHARED global lock...";
- flock ($global_lock_fh, LOCK_SH) or die "Unable to lock $lockpath: $!";
+ await_flock ($global_lock_fh, LOCK_SH) or die "Unable to lock $lockpath: $!";
DEBUG_TEST_CONCURRENCY_LOCKS > 1
and dbg "Got SHARED global lock";
return;
}
elsif ($event eq 'disconnect') {
+ return unless $connected; # we already disconnected earlier
$connected = 0;
}
elsif ($event eq 'DESTROY' and ! $connected ) {
my $guard;
if ( ($ENV{TRAVIS}||'') eq 'true' and my $old_dbg = $schema->storage->debug ) {
- $guard = Scope::Guard->new(sub { $schema->storage->debug($old_dbg) });
+ $guard = scope_guard { $schema->storage->debug($old_dbg) };
$schema->storage->debug(0);
}
my $guard;
if ( ($ENV{TRAVIS}||'') eq 'true' and my $old_dbg = $schema->storage->debug ) {
- $guard = Scope::Guard->new(sub { $schema->storage->debug($old_dbg) });
+ $guard = scope_guard { $schema->storage->debug($old_dbg) };
$schema->storage->debug(0);
}