Merge 'trunk' into 'prefetch'

[dbsrgits/DBIx-Class.git] / t / 103many_to_many_warning.t

diff --git a/t/103many_to_many_warning.t b/t/103many_to_many_warning.t
index c316820..a8f790a 100644 (file)
--- a/t/103many_to_many_warning.t
+++ b/t/103many_to_many_warning.t
@@ -5,14 +5,18 @@ use Test::More;
 use lib qw(t/lib);
 use Data::Dumper;
 
-plan tests => 2;
+plan ( ($] >= 5.009000 and $] < 5.010001)
+  ? (skip_all => 'warnings::register broken under 5.10: http://rt.perl.org/rt3/Public/Bug/Display.html?id=62522')
+  : (tests => 4)
+);
 
 {
   my @w; 
   local $SIG{__WARN__} = sub { push @w, @_ };
-
   my $code = gen_code ( suffix => 1 );
   eval "$code";
+  ok (! $@, 'Eval code without warnings suppression')
+    || diag $@;
 
   ok ( (grep { $_ =~ /The many-to-many relationship bars is trying to create/ } @w), "Warning triggered without relevant 'no warnings'");
 }
@@ -23,8 +27,8 @@ plan tests => 2;
 
   my $code = gen_code ( suffix => 2, no_warn => 1 );
   eval "$code";
-
-diag Dumper \@w;
+  ok (! $@, 'Eval code with warnings suppression')
+    || diag $@;
 
   ok ( (not grep { $_ =~ /The many-to-many relationship bars is trying to create/ } @w), "No warning triggered with relevant 'no warnings'");
 }
@@ -46,6 +50,7 @@ use warnings;
   package #
     DBICTest::Schema::Foo${suffix};
   use base 'DBIx::Class::Core';
+
   __PACKAGE__->table('foo');
   __PACKAGE__->add_columns(
     'fooid' => {
@@ -81,6 +86,7 @@ use warnings;
     DBICTest::Schema::Bar${suffix};
 
   use base 'DBIx::Class::Core';
+
   __PACKAGE__->table('bar');
   __PACKAGE__->add_columns(
     'barid' => {