Audit/simplify various ->is_* runmode specs

[dbsrgits/DBIx-Class.git] / t / storage / txn_scope_guard.t

diff --git a/t/storage/txn_scope_guard.t b/t/storage/txn_scope_guard.t
index afe8c8e..1b405bd 100644 (file)
--- a/t/storage/txn_scope_guard.t
+++ b/t/storage/txn_scope_guard.t
@@ -106,7 +106,7 @@ use DBICTest;
     #$schema->storage->_dbh( $schema->storage->_dbh->clone );
 
     die 'Deliberate exception';
-  }, ($] >= 5.013008 )
+  }, ( "$]" >= 5.013008 )
     ? qr/Deliberate exception/s # temporary until we get the generic exception wrapper rolling
     : qr/Deliberate exception.+Rollback failed/s
   );
@@ -173,13 +173,13 @@ for my $post_poison (0,1) {
   local $TODO = 'Do not know how to deal with trapped exceptions occuring after guard instantiation...'
     if ( $post_poison and (
       # take no chances on installation
-      ( DBICTest::RunMode->is_plain and ($ENV{TRAVIS}||'') ne 'true' )
+      DBICTest::RunMode->is_plain
         or
       # this always fails
       ! $pre_poison
         or
       # I do not understand why but on <= 5.8.8 and on 5.10.0 "$pre_poison && $post_poison" passes...
-      ($] > 5.008008 and $] < 5.010000 ) or $] > 5.010000
+      ( "$]" > 5.008008 and "$]" < 5.010000 ) or "$]" > 5.010000
     ));
 
   is (@w, 2, "Both expected warnings found - \$\@ pre-poison: $pre_poison, post-poison: $post_poison" );
@@ -227,7 +227,7 @@ for my $post_poison (0,1) {
     local $SIG{__WARN__} = sub {
       package DB;
       my $frnum;
-      while (my @f = caller(++$frnum) ) {
+      while (my @f = CORE::caller(++$frnum) ) {
         push @arg_capture, @DB::args;
       }
     };