X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=xt%2Fextra%2Finternals%2Fdescribe_class_methods.t;h=1177ac8de219a257be66f646fb097c7470af2daf;hb=8aae794001ecccdb26c2bbd1b92c97bba9e65d79;hp=5a187cc2b2cdb20e799ca75fbc8d1f13bd3e788d;hpb=92705f7f05161f7dba36d9b09dc6e893af7b2773;p=dbsrgits%2FDBIx-Class.git

diff --git a/xt/extra/internals/describe_class_methods.t b/xt/extra/internals/describe_class_methods.t
index 5a187cc..1177ac8 100644
--- a/xt/extra/internals/describe_class_methods.t
+++ b/xt/extra/internals/describe_class_methods.t
@@ -28,6 +28,7 @@ use Test::Exception;
 use DBIx::Class::_Util qw(
   quote_sub describe_class_methods
   serialize refdesc sigwarn_silencer
+  modver_gt_or_eq_and_lt
 );
 use List::Util 'shuffle';
 use Errno ();
@@ -461,14 +462,23 @@ sub add_more_attrs {
     'describing with explicit mro returns correct data'
   );
 
-  # FIXME: TODO does not work on new T::B under threads sigh
-  # https://github.com/Test-More/test-more/issues/683
-  unless(
-    ! DBIx::Class::_ENV_::OLD_MRO
-      and
-    ${^TAINT}
+  if (
+    DBIx::Class::_ENV_::OLD_MRO
+      or
+    ! DBIx::Class::_ENV_::TAINT_MODE
+      or
+    ! $INC{"threads.pm"}
+      or
+    # $TODO did not work on T::B under threads in this range
+    # https://github.com/Test-More/test-more/issues/683
+    ! modver_gt_or_eq_and_lt( 'Test::More', '1.300', '1.302027' )
   ) {
-    #local $TODO = "On 5.10+ -T combined with stash peeking invalidates the pkg_gen (wtf)" if ...
+    local $TODO = "On 5.10+ -T combined with stash peeking invalidates the pkg_gen (wtf)"
+      if
+        DBIx::Class::_ENV_::TAINT_MODE
+          and
+        DBIx::Class::_ENV_::PERL_VERSION > 5.009
+    ;
 
     ok(
       (