Revert TempExtlib ( b46b85376 ) - new Sub::Quote shipped

[dbsrgits/DBIx-Class.git] / xt / extra / lean_startup.t

diff --git a/xt/extra/lean_startup.t b/xt/extra/lean_startup.t
index 4d73f4b..c5ed8cc 100644 (file)
--- a/xt/extra/lean_startup.t
+++ b/xt/extra/lean_startup.t
@@ -40,17 +40,10 @@ BEGIN {
 
     return $res if $req =~ /^DBIx::Class|^DBICTest::/;
 
-    # FIXME - work around RT#114641
-    #
-    # Because *OF COURSE* when (questionable) unicode tests fail on < 5.8
-    # the answer is to make the entire module 5.8 only, instead of skipping
-    # the tests in question
-    # rjbs-- # thinly veiled passive aggressive bullshit
-    #
-    # The actual skip is needed because the use happens before 'package' had
-    # a chance to switch the namespace, so the shim thinks DBIC::Schema tried
-    # to require this
-    return $res if $req eq '5.008';
+    # Some modules have a bare 'use $perl_version' as the first statement
+    # Since the use() happens before 'package' had a chance to switch
+    # the namespace, the shim thinks DBIC* tried to require this
+    return $res if $req =~ /^v?[0-9.]+$/;
 
     # exclude everything where the current namespace does not match the called function
     # (this works around very weird XS-induced require callstack corruption)
@@ -98,6 +91,7 @@ BEGIN {
   # these envvars *will* bring in more stuff than the baseline
   delete @ENV{qw(
     DBIC_TRACE
+    DBIC_SHUFFLE_UNORDERED_RESULTSETS
     DBICTEST_SQLT_DEPLOY
     DBICTEST_SQLITE_REVERSE_DEFAULT_ORDER
     DBICTEST_VIA_REPLICATED
@@ -140,9 +134,9 @@ BEGIN {
     Sub::Name
     Sub::Defer
     Sub::Quote
+    attributes
 
     Scalar::Util
-    List::Util
     Storable
 
     Class::Accessor::Grouped
@@ -234,6 +228,7 @@ EOP
   my $art = $s->resultset('Artist')->create({ name => \[ '?' => 'foo'], rank => 42 });
   $art->discard_changes;
   $art->update({ rank => 69, name => 'foo' });
+  $s->resultset('Artist')->all;
   assert_no_missing_expected_requires();
 }