X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcdbi-t%2F18-has_a.t;h=ca7786ef863599d60eb699b03adf42f7f2ea0ba5;hb=331a564;hp=b0f0299d6c4476a85e75090786520fbce44e777b;hpb=96ce20f5436c31ad673bb89370d82f2c073c6e64;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/cdbi-t/18-has_a.t b/t/cdbi-t/18-has_a.t
index b0f0299..ca7786e 100644
--- a/t/cdbi-t/18-has_a.t
+++ b/t/cdbi-t/18-has_a.t
@@ -2,8 +2,13 @@ use strict;
 use Test::More;
 
 BEGIN {
-	eval "use DBD::SQLite";
-	plan $@ ? (skip_all => 'needs DBD::SQLite for testing') : (tests => 41);
+  eval "use DBIx::Class::CDBICompat;";
+  if ($@) {
+    plan (skip_all => 'Class::Trigger and DBIx::ContextualFetch required');
+    next;
+  }
+  eval "use DBD::SQLite";
+  plan $@ ? (skip_all => 'needs DBD::SQLite for testing') : (tests => 41);
 }
 
 use lib 't/testlib';
@@ -33,7 +38,7 @@ ok(
 	ok $pj = $btaste->Director, "Bad taste now hasa() director";
 	isa_ok $pj => 'Director';
 	{
-		no warnings 'redefine';
+		no warnings qw(redefine once);
 		local *Ima::DBI::st::execute =
 			sub { ::fail("Shouldn't need to query db"); };
 		is $pj->id, 'Peter Jackson', 'ID already stored';