(optdeps) One last pass through tests, streamline skip messages

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

diff --git a/t/storage/savepoints.t b/t/storage/savepoints.t
index f99c9d5..624ee9c 100644 (file)
--- a/t/storage/savepoints.t
+++ b/t/storage/savepoints.t
@@ -37,13 +37,10 @@ for ('', keys %$env2optdep) { SKIP: {
   my $prefix;
 
   if ($prefix = $_) {
-    my ($dsn, $user, $pass) = map { $ENV{"${prefix}_$_"} } qw/DSN USER PASS/;
 
-    skip ("Skipping tests with $prefix: set \$ENV{${prefix}_DSN} _USER and _PASS", 1)
-      unless $dsn;
+    DBIx::Class::Optional::Dependencies->skip_without($env2optdep->{$prefix});
 
-    skip ("Testing with ${prefix}_DSN needs " . DBIx::Class::Optional::Dependencies->req_missing_for( $env2optdep->{$prefix} ), 1)
-      unless  DBIx::Class::Optional::Dependencies->req_ok_for($env2optdep->{$prefix});
+    my ($dsn, $user, $pass) = map { $ENV{"${prefix}_$_"} } qw/DSN USER PASS/;
 
     $schema = DBICTest::Schema->connect ($dsn,$user,$pass,{ auto_savepoint => 1 });
 
@@ -231,7 +228,7 @@ for ('', keys %$env2optdep) { SKIP: {
   is_deeply( $schema->storage->savepoints, [], 'All savepoints forgotten' );
 
 SKIP: {
-  skip "Reading inexplicably fails on very old replicated DBD::SQLite<1.33", 1 if (
+  skip "FIXME: Reading inexplicably fails on very old replicated DBD::SQLite<1.33", 1 if (
     $ENV{DBICTEST_VIA_REPLICATED}
       and
     $prefix eq 'SQLite Internal DB'