X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstorage%2Fsavepoints.t;fp=t%2Fstorage%2Fsavepoints.t;h=b125d6e45f003ed9260a90ef06b3d85e8d829a5f;hb=66c817df10d62ecc3d49df5839b1048e3454b2cf;hp=66b7d71a40bdb2793c0e2e580e04fc958ae2dafa;hpb=67cbc0a8171b13f8c90ec5c5184d598a3b63e007;p=dbsrgits%2FDBIx-Class.git diff --git a/t/storage/savepoints.t b/t/storage/savepoints.t index 66b7d71..b125d6e 100644 --- a/t/storage/savepoints.t +++ b/t/storage/savepoints.t @@ -6,8 +6,7 @@ use warnings; use Test::More; use Test::Exception; use DBIx::Class::Optional::Dependencies; -use DBIx::Class::_Util qw(modver_gt_or_eq sigwarn_silencer scope_guard); - +use DBIx::Class::_Util qw(sigwarn_silencer scope_guard); use DBICTest; @@ -228,15 +227,6 @@ for ('', keys %$env2optdep) { SKIP: { is_deeply( $schema->storage->savepoints, [], 'All savepoints forgotten' ); -SKIP: { - skip "FIXME: Reading inexplicably fails on very old replicated DBD::SQLite<1.33", 1 if ( - $ENV{DBICTEST_VIA_REPLICATED} - and - $prefix eq 'SQLite Internal DB' - and - ! modver_gt_or_eq('DBD::SQLite', '1.33') - ); - ok($ars->search({ name => 'in_outer_transaction' })->first, 'commit from outer transaction'); ok($ars->search({ name => 'in_outer_transaction2' })->first, @@ -246,7 +236,9 @@ SKIP: { is $ars->search({ name => 'in_inner_transaction_rolling_back' })->first, undef, 'rollback from inner transaction'; -} + + # make sure a fresh txn will work after above + $schema->storage->txn_do(sub { ok "noop" } ); ### cleanupz $schema->storage->dbh_do(sub { $_[1]->do("DROP TABLE artist") }); @@ -255,8 +247,6 @@ SKIP: { done_testing; END { - local $SIG{__WARN__} = sigwarn_silencer( qr/Internal transaction state of handle/ ) - unless modver_gt_or_eq('DBD::SQLite', '1.33'); eval { $schema->storage->dbh_do(sub { $_[1]->do("DROP TABLE artist") }) } if defined $schema; undef $schema; }