[Bast-commits] r9469 - DBIx-Class/0.08/trunk/t

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2010-05-31 12:21:03 +0100 (Mon, 31 May 2010)
New Revision: 9469

Modified:
   DBIx-Class/0.08/trunk/t/74mssql.t
Log:
Skip tests segfaulting with ancient DBD::Sybase versions

Modified: DBIx-Class/0.08/trunk/t/74mssql.t
===================================================================
--- DBIx-Class/0.08/trunk/t/74mssql.t	2010-05-31 07:55:05 UTC (rev 9468)
+++ DBIx-Class/0.08/trunk/t/74mssql.t	2010-05-31 11:21:03 UTC (rev 9469)
@@ -52,13 +52,17 @@
 
   isa_ok($schema->storage, "DBIx::Class::Storage::$storage_type");
 
-# start disconnected to test _ping
-  $schema->storage->_dbh->disconnect;
+  SKIP: {
+    skip 'This version of DBD::Sybase segfaults on disconnect', 1 if DBD::Sybase->VERSION < 1.08;
 
-  lives_ok {
-    $schema->storage->dbh_do(sub { $_[1]->do('select 1') })
-  } '_ping works';
+    # start disconnected to test _ping
+    $schema->storage->_dbh->disconnect;
 
+    lives_ok {
+      $schema->storage->dbh_do(sub { $_[1]->do('select 1') })
+    } '_ping works';
+  }
+
   my $dbh = $schema->storage->dbh;
 
   $dbh->do("IF OBJECT_ID('artist', 'U') IS NOT NULL
@@ -177,9 +181,9 @@
   SKIP: {
     my $storage = $schema->storage;
     my $version = $storage->_server_info->{normalized_dbms_version};
-    
-    skip 1, 'could not detect SQL Server version' if not defined $version;
 
+    skip 'could not detect SQL Server version', 1 if not defined $version;
+
     my $have_rno = $version >= 9 ? 1 : 0;
 
     # Delete version information to force RNO check when rebuilding SQLA