Skip tests on smokers with a broken DBIC trial

[scpubgit/Q-Branch.git] / t / dbic / no-repeats.t

diff --git a/t/dbic/no-repeats.t b/t/dbic/no-repeats.t
index 1ec4c53..cc88488 100644 (file)
--- a/t/dbic/no-repeats.t
+++ b/t/dbic/no-repeats.t
@@ -2,6 +2,16 @@ use strict;
 use warnings;
 
 use Test::More;
+
+BEGIN {
+  # ask for a recent DBIC version to skip the 5.6 tests as well
+  plan skip_all => 'Test temporarily requires DBIx::Class'
+    unless eval { require DBIx::Class::Storage::Statistics; DBIx::Class->VERSION('0.08124') };
+
+  plan skip_all => 'Test does not properly work with the pre-0.082800 DBIC trials'
+    if DBIx::Class->VERSION =~ /^0.082700\d\d/;
+}
+
 use DBIx::Class::Storage::Debug::PrettyPrint;
 
 my $cap;
@@ -11,7 +21,7 @@ my $pp = DBIx::Class::Storage::Debug::PrettyPrint->new({
    profile => 'none',
    squash_repeats => 1,
    fill_in_placeholders => 1,
-   placeholder_surround => [qw(' ')],
+   placeholder_surround => ['', ''],
    show_progress => 0,
 });
 
@@ -20,7 +30,7 @@ $pp->debugfh($fh);
 $pp->query_start('SELECT * FROM frew WHERE id = ?', q('1'));
 is(
    $cap,
-   qq(SELECT * FROM frew WHERE id = '1'\n\n),
+   qq(SELECT * FROM frew WHERE id = '1'\n),
    'SQL Logged'
 );
 
@@ -28,7 +38,7 @@ open $fh, '>', \$cap;
 $pp->query_start('SELECT * FROM frew WHERE id = ?', q('2'));
 is(
    $cap,
-   qq(... : '2'\n\n),
+   qq(... : '2'\n),
    'Repeated SQL ellided'
 );
 
@@ -36,7 +46,7 @@ open $fh, '>', \$cap;
 $pp->query_start('SELECT * FROM frew WHERE id = ?', q('3'));
 is(
    $cap,
-   qq(... : '3'\n\n),
+   qq(... : '3'\n),
    'Repeated SQL ellided'
 );
 
@@ -44,7 +54,7 @@ open $fh, '>', \$cap;
 $pp->query_start('SELECT * FROM frew WHERE id = ?', q('4'));
 is(
    $cap,
-   qq(... : '4'\n\n),
+   qq(... : '4'\n),
    'Repeated SQL ellided'
 );
 
@@ -52,7 +62,7 @@ open $fh, '>', \$cap;
 $pp->query_start('SELECT * FROM bar WHERE id = ?', q('4'));
 is(
    $cap,
-   qq(SELECT * FROM bar WHERE id = '4'\n\n),
+   qq(SELECT * FROM bar WHERE id = '4'\n),
    'New SQL Logged'
 );
 
@@ -60,7 +70,7 @@ open $fh, '>', \$cap;
 $pp->query_start('SELECT * FROM frew WHERE id = ?', q('1'));
 is(
    $cap,
-   qq(SELECT * FROM frew WHERE id = '1'\n\n),
+   qq(SELECT * FROM frew WHERE id = '1'\n),
    'New SQL Logged'
 );