X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F10_04db2_common.t;h=0533dc0726ad0b2c4f7f4a34153c3c4adc18e178;hb=46e71a1b3527936e885facc87a97c586d25ecc67;hp=4dd1936fde741656b030d0f94b4e0ad40a9d64ef;hpb=4fb2971cd5784d8bc64f98052e691db9df697516;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/t/10_04db2_common.t b/t/10_04db2_common.t
index 4dd1936..0533dc0 100644
--- a/t/10_04db2_common.t
+++ b/t/10_04db2_common.t
@@ -1,10 +1,12 @@
+use DBIx::Class::Schema::Loader::Optional::Dependencies
+    -skip_all_without => 'test_rdbms_db2';
+
 use strict;
 use warnings;
 use Test::More;
 use Test::Exception;
 use Try::Tiny;
 use File::Path 'rmtree';
-use DBIx::Class::Optional::Dependencies;
 use DBIx::Class::Schema::Loader 'make_schema_at';
 
 use lib qw(t/lib);
@@ -18,12 +20,6 @@ my $dsn      = $ENV{DBICTEST_DB2_DSN} || '';
 my $user     = $ENV{DBICTEST_DB2_USER} || '';
 my $password = $ENV{DBICTEST_DB2_PASS} || '';
 
-plan skip_all => 'You need to set the DBICTEST_DB2_DSN, _USER, and _PASS environment variables'
-    unless ($dsn && $user);
-
-plan skip_all => 'You need to install ' . DBIx::Class::Optional::Dependencies->req_missing_for ('rdbms_db2')
-    unless DBIx::Class::Optional::Dependencies->req_ok_for ('rdbms_db2');
-
 my ($schema, $schemas_created); # for cleanup in END for extra tests
 
 my $srv_ver = do {
@@ -41,7 +37,7 @@ my $extra_graphics_data_types = {
     'dbclob'           => { data_type => 'dbclob' },
 };
 
-my $tester = dbixcsl_common_tests->new(
+dbixcsl_common_tests->new(
     vendor         => 'DB2',
     auto_inc_pk    => 'INTEGER GENERATED BY DEFAULT AS IDENTITY NOT NULL PRIMARY KEY',
     dsn            => $dsn,
@@ -152,7 +148,7 @@ my $tester = dbixcsl_common_tests->new(
                 }
                 catch {
                     $schemas_created = 0;
-                    skip "no CREATE SCHEMA privileges", 28 * 2;
+                    skip "no CREATE SCHEMA privileges", 30 * 2;
                 };
 
                 $dbh->do(<<"EOF");
@@ -356,9 +352,7 @@ EOF
 
         },
     },
-);
-
-$tester->run_tests();
+)->run_tests();
 
 END {
     if (not $ENV{SCHEMA_LOADER_TESTS_NOCLEANUP}) {