X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F748informix.t;h=cd9ad354b1a43c8f94cf5b2b74bbe2c31a2ed339;hb=86a432d4cc096062e2374f118ce38aa131799d6a;hp=02ee6bbb0a57080bb87a896dc38325af7e726377;hpb=d3774d9b7a75a61a74ad08d5cb682596a908d951;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/748informix.t b/t/748informix.t
index 02ee6bb..cd9ad35 100644
--- a/t/748informix.t
+++ b/t/748informix.t
@@ -1,18 +1,16 @@
+BEGIN { do "./t/lib/ANFANG.pm" or die ( $@ || $! ) }
+use DBIx::Class::Optional::Dependencies -skip_all_without => 'test_rdbms_informix';
+
 use strict;
 use warnings;
 
 use Test::More;
 use Test::Exception;
-use lib qw(t/lib);
+
 use DBICTest;
 
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_INFORMIX_${_}" } qw/DSN USER PASS/};
 
-#warn "$dsn $user $pass";
-
-plan skip_all => 'Set $ENV{DBICTEST_INFORMIX_DSN}, _USER and _PASS to run this test'
-  unless $dsn;
-
 my $schema = DBICTest::Schema->connect($dsn, $user, $pass, {
   auto_savepoint => 1
 });
@@ -97,7 +95,7 @@ is( $lim->next->artistid, 102, "iterator->next ok" );
 is( $lim->next, undef, "next past end of resultset ok" );
 
 # test savepoints
-eval {
+throws_ok {
   $schema->txn_do(sub {
     eval {
       $schema->txn_do(sub {
@@ -110,9 +108,7 @@ eval {
     $ars->create({ name => 'in_outer_txn' });
     die "rolling back outer txn";
   });
-};
-
-like $@, qr/rolling back outer txn/,
+} qr/rolling back outer txn/,
   'correct exception for rollback';
 
 ok ((not $ars->search({ name => 'in_outer_txn' })->first),
@@ -131,7 +127,7 @@ lives_ok {
 } 'with_deferred_fk_checks code survived';
 
 is eval { $schema->resultset('Track')->find(999)->title }, 'deferred FK track',
- 'code in with_deferred_fk_checks worked'; 
+ 'code in with_deferred_fk_checks worked';
 
 throws_ok {
   $schema->resultset('Track')->create({
@@ -143,6 +139,7 @@ done_testing;
 
 # clean up our mess
 END {
-    my $dbh = eval { $schema->storage->_dbh };
-    $dbh->do("DROP TABLE artist") if $dbh;
+  my $dbh = eval { $schema->storage->_dbh };
+  $dbh->do("DROP TABLE artist") if $dbh;
+  undef $schema;
 }