diff options
author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2016-03-03 17:58:30 -0300 |
---|---|---|
committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2016-03-03 17:58:30 -0300 |
commit | 2c83f435a3deca745c666e9778229d64cb2dfc79 (patch) | |
tree | 4fd862e34299e2abee0fbd58e075a9fbdb3fbf66 /src/bin/scripts/t/010_clusterdb.pl | |
parent | 7d9a4301c08148509136c296866196f6b19ee2c2 (diff) |
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
Diffstat (limited to 'src/bin/scripts/t/010_clusterdb.pl')
-rw-r--r-- | src/bin/scripts/t/010_clusterdb.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/scripts/t/010_clusterdb.pl b/src/bin/scripts/t/010_clusterdb.pl index 11d678a8676..0e677cacf18 100644 --- a/src/bin/scripts/t/010_clusterdb.pl +++ b/src/bin/scripts/t/010_clusterdb.pl @@ -21,7 +21,7 @@ $node->issues_sql_like( $node->command_fails([ 'clusterdb', '-t', 'nonexistent' ], 'fails with nonexistent table'); -$node->psql('postgres', +$node->safe_psql('postgres', 'CREATE TABLE test1 (a int); CREATE INDEX test1x ON test1 (a); CLUSTER test1 USING test1x' ); $node->issues_sql_like( |