X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstorage%2Fglobal_destruction.t;h=5b7fc8559ec73a62c905edd56269932ccd22bc0a;hb=86be9bcb90213db633791fcce074b7268765f615;hp=4fb49cb68032df4f2d7de8511be6cdf9561d01cc;hpb=c7e856308aeac1faa6f4d8ad59da096e009d70f4;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/storage/global_destruction.t b/t/storage/global_destruction.t
index 4fb49cb..5b7fc85 100644
--- a/t/storage/global_destruction.t
+++ b/t/storage/global_destruction.t
@@ -1,43 +1,35 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+
 use strict;
 use warnings;
 
 use Test::More;
 
+# so we can see the retry exceptions (if any)
+BEGIN { $ENV{DBIC_STORAGE_RETRY_DEBUG} = 1 }
+
 use DBIx::Class::Optional::Dependencies ();
 
-use lib qw(t/lib);
+
 use DBICTest;
 
 for my $type (qw/PG MYSQL SQLite/) {
 
   SKIP: {
+
+    DBIx::Class::Optional::Dependencies->skip_without( 'test_rdbms_' . lc $type );
+
     my @dsn = $type eq 'SQLite'
-      ? DBICTest->_database(sqlite_use_file => 1)
-      : do {
-        skip "Skipping $type tests without DBICTEST_${type}_DSN", 1
-          unless $ENV{"DBICTEST_${type}_DSN"};
-        @ENV{map { "DBICTEST_${type}_${_}" } qw/DSN USER PASS/}
-      }
+      ? ( DBICTest->_database(sqlite_use_file => 1) )
+      : ( @ENV{map { "DBICTEST_${type}_${_}" } qw/DSN USER PASS/} )
     ;
 
-    if ($type eq 'PG') {
-      skip "skipping Pg tests without dependencies installed", 1
-        unless DBIx::Class::Optional::Dependencies->req_ok_for('test_rdbms_pg');
-    }
-    elsif ($type eq 'MYSQL') {
-      skip "skipping MySQL tests without dependencies installed", 1
-        unless DBIx::Class::Optional::Dependencies->req_ok_for('test_rdbms_mysql');
-    }
-
     my $schema = DBICTest::Schema->connect (@dsn);
 
     # emulate a singleton-factory, just cache the object *somewhere in a different package*
     # to induce out-of-order destruction
     $DBICTest::FakeSchemaFactory::schema = $schema;
 
-    # so we can see the retry exceptions (if any)
-    $ENV{DBIC_DBIRETRY_DEBUG} = 1;
-
     ok (!$schema->storage->connected, "$type: start disconnected");
 
     $schema->txn_do (sub {