[Bast-commits] r3870 - in trunk/DBIx-Class-Schema-Loader: . t

[ilmari at dev.catalyst.perl.org]

Author: ilmari
Date: 2007-11-09 16:41:45 +0000 (Fri, 09 Nov 2007)
New Revision: 3870

Modified:
   trunk/DBIx-Class-Schema-Loader/Changes
   trunk/DBIx-Class-Schema-Loader/t/22dump.t
Log:
Fix Win32 test skip counts for good (RT #30568, Kenichi Ishigaki)

Modified: trunk/DBIx-Class-Schema-Loader/Changes
===================================================================
--- trunk/DBIx-Class-Schema-Loader/Changes	2007-11-09 12:31:12 UTC (rev 3869)
+++ trunk/DBIx-Class-Schema-Loader/Changes	2007-11-09 16:41:45 UTC (rev 3870)
@@ -1,5 +1,6 @@
 Revision history for Perl extension DBIx::Class::Schema::Loader
 
+        - Fix Win32 test skip counts for good (RT #30568, Kenichi Ishigaki)
         - Default Oracle db_schema to db username (patch
           from Johannes Plunien)
 

Modified: trunk/DBIx-Class-Schema-Loader/t/22dump.t
===================================================================
--- trunk/DBIx-Class-Schema-Loader/t/22dump.t	2007-11-09 12:31:12 UTC (rev 3869)
+++ trunk/DBIx-Class-Schema-Loader/t/22dump.t	2007-11-09 16:41:45 UTC (rev 3870)
@@ -33,7 +33,12 @@
 DBICTest::Schema::1->_loader_invoked(undef);
 
 SKIP: {
-  skip "ActiveState perl produces additional warnings", 3
+  my @warnings_regexes = (
+      qr|Dumping manual schema|,
+      qr|Schema dump completed|,
+  );
+
+  skip "ActiveState perl produces additional warnings", scalar @warnings_regexes
     if ($^O eq 'MSWin32');
 
   my @warn_output;
@@ -41,10 +46,6 @@
       local $SIG{__WARN__} = sub { push(@warn_output, @_) };
       DBICTest::Schema::1->connect($make_dbictest_db::dsn);
   }
-  my @warnings_regexes = (
-      qr|Dumping manual schema|,
-      qr|Schema dump completed|,
-  );
 
   like(shift @warn_output, $_) foreach (@warnings_regexes);