fix MSSQL tests

[dbsrgits/DBIx-Class-Schema-Loader.git] / t / 18firebird_common.t

diff --git a/t/18firebird_common.t b/t/18firebird_common.t
index 486bea2..cd1014e 100644 (file)
--- a/t/18firebird_common.t
+++ b/t/18firebird_common.t
@@ -114,6 +114,7 @@ my $tester = dbixcsl_common_tests->new(
         count  => 6,
         run    => sub {
             $schema = shift;
+            my ($monikers, $classes, $self) = @_;
 
             cleanup_extra();
 
@@ -146,11 +147,7 @@ q{
             local $schema->_loader->{preserve_case} = 1;
             $schema->_loader->_setup;
 
-            {
-                # FIXME - need to remove blind trap (can not test firebird yet)
-                local $SIG{__WARN__} = sub {};
-                $schema->rescan;
-            }
+            $self->rescan_without_warnings($schema);
 
             ok ((my $rsrc = eval { $schema->resultset('FirebirdLoaderTest1')->result_source }),
                 'got rsrc for mixed case table');
@@ -175,8 +172,8 @@ if (not ($dbd_interbase_dsn || $odbc_dsn)) {
 else {
     # get rid of stupid warning from InterBase/GetInfo.pm
     if ($dbd_interbase_dsn) {
-        # FIXME - need to remove blind trap (can not test firebird yet)
-        local $SIG{__WARN__} = sub {};
+        local $SIG{__WARN__} = sub { warn @_
+            unless $_[0] =~ m|^Use of uninitialized value in sprintf at \S+DBD/InterBase/GetInfo\.pm line \d+\.$| };
         require DBD::InterBase;
         require DBD::InterBase::GetInfo;
     }
@@ -195,3 +192,4 @@ sub cleanup_extra {
         eval { $dbh->do($stmt) };
     }
 }
+# vim:et sts=4 sw=4 tw=0: