t/ janitorial work

diff --git a/t/19quotes.t b/t/19quotes.t
index d8ba469..622eefb 100644 (file)
--- a/t/19quotes.t
+++ b/t/19quotes.t
@@ -19,7 +19,7 @@ use_ok('DBICTest');
 use_ok('DBIC::DebugObj');
 my $schema = DBICTest->init_schema();
 
-diag('Testing against ' . join(' ', map { $schema->storage->dbh->get_info($_) } qw/17 18/));
+#diag('Testing against ' . join(' ', map { $schema->storage->dbh->get_info($_) } qw/17 18/));
 
 $schema->storage->sql_maker->quote_char('`');
 $schema->storage->sql_maker->name_sep('.');

diff --git a/t/19quotes_newstyle.t b/t/19quotes_newstyle.t
index 748b112..80e6d04 100644 (file)
--- a/t/19quotes_newstyle.t
+++ b/t/19quotes_newstyle.t
@@ -19,7 +19,7 @@ use_ok('DBIC::DebugObj');
 
 my $schema = DBICTest->init_schema();
 
-diag('Testing against ' . join(' ', map { $schema->storage->dbh->get_info($_) } qw/17 18/));
+#diag('Testing against ' . join(' ', map { $schema->storage->dbh->get_info($_) } qw/17 18/));
 
 my $dsn = $schema->storage->_dbi_connect_info->[0];
 $schema->connection(

diff --git a/t/39load_namespaces_rt41083.t b/t/39load_namespaces_rt41083.t
index 5a6ea82..861658e 100644 (file)
--- a/t/39load_namespaces_rt41083.t
+++ b/t/39load_namespaces_rt41083.t
@@ -6,6 +6,25 @@ use Test::More skip_all => 'Postponed until after 0.08100';
 
 use lib 't/lib';
 
+=begin
+
+How did this get back here? The test is borked, there is a branch with
+the correct test and a tentative fix - branches/subclassed_rsset
+
+Make sure to nuke this file when merging, it is only left here to make
+merging of the above branch easier.
+
+
+ribasushi
+
+
+=cut
+
+
+__END__
+
+
+
 plan tests => 15;
 
 sub _chk_warning {

diff --git a/t/66relationship.t b/t/66relationship.t
index 31d28d4..48fcb2a 100644 (file)
--- a/t/66relationship.t
+++ b/t/66relationship.t
@@ -41,7 +41,7 @@ if ($INC{'DBICTest/HelperRels.pm'}) {
   } );
 
  SKIP:{
-    skip "Can't fix right now", 1 unless $DBIx::Class::VERSION >= '0.09';
+    skip "Can't fix right now", 1 if $DBIx::Class::VERSION < 0.09;
     lives_ok { $big_flop->genre} "Don't throw exception when col is not loaded after insert";
   };
 }

diff --git a/t/71mysql.t b/t/71mysql.t
index dbba1cd..467b4d3 100644 (file)
--- a/t/71mysql.t
+++ b/t/71mysql.t
@@ -108,7 +108,7 @@ NULLINSEARCH: {
     => 'Created an artist resultset of undef';
     
     TODO: {
-       $TODO = "need to fix the row count =1 when select * from table where pk IS NULL problem";
+       local $TODO = "need to fix the row count =1 when select * from table where pk IS NULL problem";
            is $artist2_rs->count, 0
            => 'got no rows';           
     }

diff --git a/t/89inflate_datetime.t b/t/89inflate_datetime.t
index 91bbd2a..f3c0e01 100644 (file)
--- a/t/89inflate_datetime.t
+++ b/t/89inflate_datetime.t
@@ -5,7 +5,10 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-DBICTest::Schema->load_classes('EventTZDeprecated');
+{
+  local $SIG{__WARN__} = sub { warn @_ if $_[0] !~ /extra \=\> .+? has been deprecated/ };
+  DBICTest::Schema->load_classes('EventTZDeprecated');
+}
 
 my $schema = DBICTest->init_schema();