]> granicus.if.org Git - postgresql/commit
Rework PostgresNode's psql method
authorAlvaro Herrera <alvherre@alvh.no-ip.org>
Thu, 3 Mar 2016 20:58:30 +0000 (17:58 -0300)
committerAlvaro Herrera <alvherre@alvh.no-ip.org>
Thu, 3 Mar 2016 20:58:30 +0000 (17:58 -0300)
commit2c83f435a3deca745c666e9778229d64cb2dfc79
tree4fd862e34299e2abee0fbd58e075a9fbdb3fbf66
parent7d9a4301c08148509136c296866196f6b19ee2c2
Rework PostgresNode's psql method

This makes the psql() method much more capable: it captures both stdout
and stderr; it now returns the psql exit code rather than stdout; a
timeout can now be specified, as can ON_ERROR_STOP behavior; it gained a
new "on_error_die" (defaulting to off) parameter to raise an exception
if there's any problem.  Finally, additional parameters to psql can be
passed if there's need for further tweaking.

For convenience, a new safe_psql() method retains much of the old
behavior of psql(), except that it uses on_error_die on, so that
problems like syntax errors in SQL commands can be detected more easily.

Many existing TAP test files now use safe_psql, which is what is really
wanted.  A couple of ->psql() calls are now added in the commit_ts
tests, which verify that the right thing is happening on certain errors.
Some ->command_fails() calls in recovery tests that were verifying that
psql failed also became ->psql() calls now.

Author: Craig Ringer. Some tweaks by Álvaro Herrera
Reviewed-By: Michaël Paquier
16 files changed:
src/bin/pg_basebackup/t/010_pg_basebackup.pl
src/bin/pgbench/t/001_pgbench.pl
src/bin/scripts/t/010_clusterdb.pl
src/bin/scripts/t/030_createlang.pl
src/bin/scripts/t/050_dropdb.pl
src/bin/scripts/t/070_dropuser.pl
src/bin/scripts/t/090_reindexdb.pl
src/test/modules/commit_ts/t/001_base.pl
src/test/modules/commit_ts/t/002_standby.pl
src/test/modules/commit_ts/t/003_standby_2.pl
src/test/perl/PostgresNode.pm
src/test/recovery/t/001_stream_rep.pl
src/test/recovery/t/002_archiving.pl
src/test/recovery/t/003_recovery_targets.pl
src/test/recovery/t/004_timeline_switch.pl
src/test/recovery/t/005_replay_delay.pl