Eschew "RESET statement_timeout" in tests.
Instead, use transaction abort. Given an unlucky bout of latency, the
timeout would cancel the RESET itself. Buildfarm members gharial,
lapwing, mereswine, shearwater, and sungazer witness that. Back-patch
to 9.1 (all supported versions). The query_canceled test still could
timeout before entering its subtransaction; for whatever reason, that
has yet to happen on the buildfarm.
Branch
------
master
Details
-------
http://git.postgresql.org/pg/commitdiff/8e3b4d9d40244c037bbc6e182ea3fabb9347d482
Modified Files
--------------
src/test/regress/expected/plpgsql.out | 43 ++++++++++++++++--------
src/test/regress/expected/prepared_xacts.out | 6 ++--
src/test/regress/expected/prepared_xacts_1.out | 6 ++--
src/test/regress/sql/plpgsql.sql | 37 +++++++++++++-------
src/test/regress/sql/prepared_xacts.sql | 6 ++--
5 files changed, 65 insertions(+), 33 deletions(-)