From: Peter Rabbitson Date: Tue, 19 Mar 2013 08:02:05 +0000 (+0100) Subject: Fix test failing with some tracing envvars (and smoke on travis too) X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=eba59b7e463e42df785ba10b33c9939b1c3b87dc;p=dbsrgits%2FDBIx-Class-Historic.git Fix test failing with some tracing envvars (and smoke on travis too) --- diff --git a/.travis.yml b/.travis.yml index f51eeac..f457959 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,6 +82,7 @@ matrix: - CLEANTEST=false - BREWOPTS="-Duseithreads" - BREWVER=5.8.5 + - DBIC_TRACE_PROFILE=console # minimum supported without threads - perl: 5.8.3_nt @@ -89,6 +90,7 @@ matrix: - 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 diff --git a/t/resultset/update_delete.t b/t/resultset/update_delete.t index aea2ba7..340bb41 100644 --- a/t/resultset/update_delete.t +++ b/t/resultset/update_delete.t @@ -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);