Adjust todo escape, use travis-provided 5.8 for one of the poisontests

diff --git a/.travis.yml b/.travis.yml
index 7bf1fa1..88c6684 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -138,7 +138,7 @@ matrix:
         - POISON_ENV=true
         - DBIC_TRACE_PROFILE=console
 
-    - perl: 5.18
+    - perl: 5.8
       env:
         - CLEANTEST=true
         - POISON_ENV=true
@@ -205,6 +205,9 @@ matrix:
 
   # which ones of the above can fail
   allow_failures:
+    # disable until RT#92413 is fixed
+    - perl: 5.8
+
     # these run with various dev snapshots - allowed to fail
     - perl: devcpan_5.8.7_thr
     - perl: devcpan_5.10.0_thr_mb

diff --git a/t/storage/txn_scope_guard.t b/t/storage/txn_scope_guard.t
index 4deffdd..4a2c14b 100644 (file)
--- a/t/storage/txn_scope_guard.t
+++ b/t/storage/txn_scope_guard.t
@@ -178,8 +178,8 @@ for my $post_poison (0,1) {
       # this always fails
       ! $pre_poison
         or
-      # I do not underdtand why but on <= 5.8.8 and $pre_poison && $post_poison passes...
-      $] > 5.008008
+      # 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
     ));
 
   is (@w, 2, "Both expected warnings found - \$\@ pre-poison: $pre_poison, post-poison: $post_poison" );