Permalink
Browse files

Fix test failing with some tracing envvars (and smoke on travis too)

  • Loading branch information...
1 parent aab82aa commit eba59b7e463e42df785ba10b33c9939b1c3b87dc @ribasushi ribasushi committed Mar 19, 2013
Showing with 21 additions and 1 deletion.
  1. +20 −0 .travis.yml
  2. +1 −1 t/resultset/update_delete.t
View
@@ -82,13 +82,15 @@ matrix:
- CLEANTEST=false
- BREWOPTS="-Duseithreads"
- BREWVER=5.8.5
+ - DBIC_TRACE_PROFILE=console
# minimum supported without threads
- perl: 5.8.3_nt
env:
- CLEANTEST=false
- BREWOPTS=""
- BREWVER=5.8.3
+ - DBIC_TRACE_PROFILE=console_monochrome
# check CLEANTEST of minimum supported
- perl: 5.8.3_nt_mb
@@ -111,6 +113,24 @@ matrix:
- BREWOPTS="-Duseithreads -Dusemorebits"
- BREWVER=5.8.8
+ # some permutations of tracing envvar testing
+ - perl: 5.16
+ env:
+ - CLEANTEST=false
+ - DBIC_TRACE=1
+
+ - perl: 5.16
+ env:
+ - CLEANTEST=true
+ - DBIC_TRACE=1
+ - DBIC_TRACE_PROFILE=console
+
+ - perl: 5.16
+ env:
+ - CLEANTEST=false
+ - DBIC_TRACE=1
+ - DBIC_TRACE_PROFILE=console_monochrome
+
# sourcing the files is *EXTREMELY* important - otherwise
# no envvars will survive
@@ -114,7 +114,7 @@ $schema->storage->_use_multicolumn_in (1);
$schema->storage->debugobj ($debugobj);
$schema->storage->debug (1);
throws_ok { $fks->update ({ read_count => \ 'read_count + 1' }) } # this can't actually execute, we just need the "as_query"
- qr/\Q DBI Exception:/ or do { $sql = ''; @bind = () };
+ qr/\QDBI Exception:/ or do { $sql = ''; @bind = () };
$schema->storage->_use_multicolumn_in (undef);
$schema->storage->debugobj ($orig_debugobj);
$schema->storage->debug ($orig_debug);

0 comments on commit eba59b7

Please sign in to comment.