mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve some psql test code

Browse Source 
Split psql_like() into two functions psql_like() and psql_fails_like()
and make them mirror the existing command_like() and
command_fails_like() more closely.  In particular, follow the
universal convention that the test name is the last argument.

Discussion: https://www.postgresql.org/message-id/3199e176-424e-1bef-f180-c1548466c2da@enterprisedb.com
This commit is contained in:
Peter Eisentraut 2022-02-22 13:42:38 +01:00
parent 667726fbe5
commit fbee60f6a4
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/bin/psql/t/001_basic.pl
View File

@ -12,40 +12,36 @@ program_help_ok('psql');
program_version_ok('psql'); program_version_ok('psql');
program_options_handling_ok('psql'); program_options_handling_ok('psql');
my ($stdout, $stderr); # Execute a psql command and check its output.
my $result;
# Execute a psql command and check its result patterns.
sub psql_like sub psql_like
{ {
local $Test::Builder::Level = $Test::Builder::Level + 1; local $Test::Builder::Level = $Test::Builder::Level + 1;
my $node = shift; my ($node, $sql, $expected_stdout, $test_name) = @_;
my $test_name = shift;
my $query = shift;
my $expected_stdout = shift;
my $expected_stderr = shift;
die "cannot specify both expected stdout and stderr here" my ($ret, $stdout, $stderr) = $node->psql('postgres', $sql);
if (defined($expected_stdout) && defined($expected_stderr));
is($ret, 0, "$test_name: exit code 0");
is($stderr, '', "$test_name: no stderr");
like($stdout, $expected_stdout, "$test_name: matches");
return;
}
# Execute a psql command and check that it fails and check the stderr.
sub psql_fails_like
{
local $Test::Builder::Level = $Test::Builder::Level + 1;
my ($node, $sql, $expected_stderr, $test_name) = @_;
# Use the context of a WAL sender, some of the tests rely on that. # Use the context of a WAL sender, some of the tests rely on that.
my ($ret, $stdout, $stderr) = $node->psql( my ($ret, $stdout, $stderr) = $node->psql(
'postgres', $query, 'postgres', $sql,
on_error_die => 0,
replication => 'database'); replication => 'database');
if (defined($expected_stdout)) isnt($ret, 0, "$test_name: exit code not 0");
{ like($stderr, $expected_stderr, "$test_name: matches");
is($ret, 0, "$test_name: expected result code");
is($stderr, '', "$test_name: no stderr");
like($stdout, $expected_stdout, "$test_name: stdout matches");
}
if (defined($expected_stderr))
{
isnt($ret, 0, "$test_name: expected result code");
like($stderr, $expected_stderr, "$test_name: stderr matches");
}
return; return;
} }
@ -53,6 +49,9 @@ sub psql_like
# test --help=foo, analogous to program_help_ok() # test --help=foo, analogous to program_help_ok()
foreach my $arg (qw(commands variables)) foreach my $arg (qw(commands variables))
{ {
my ($stdout, $stderr);
my $result;
$result = IPC::Run::run [ 'psql', "--help=$arg" ], '>', \$stdout, '2>', $result = IPC::Run::run [ 'psql', "--help=$arg" ], '>', \$stdout, '2>',
\$stderr; \$stderr;
ok($result, "psql --help=$arg exit code 0"); ok($result, "psql --help=$arg exit code 0");
@ -70,15 +69,15 @@ max_wal_senders = 4
}); });
$node->start; $node->start;
psql_like($node, '\copyright', '\copyright', qr/Copyright/, undef); psql_like($node, '\copyright', qr/Copyright/, '\copyright');
psql_like($node, '\help without arguments', '\help', qr/ALTER/, undef); psql_like($node, '\help', qr/ALTER/, '\help without arguments');
psql_like($node, '\help with argument', '\help SELECT', qr/SELECT/, undef); psql_like($node, '\help SELECT', qr/SELECT/, '\help with argument');
# Test clean handling of unsupported replication command responses # Test clean handling of unsupported replication command responses
psql_like( psql_fails_like(
$node, $node,
'handling of unexpected PQresultStatus',
'START_REPLICATION 0/0', 'START_REPLICATION 0/0',
undef, qr/unexpected PQresultStatus: 8$/); qr/unexpected PQresultStatus: 8$/,
'handling of unexpected PQresultStatus');
done_testing(); done_testing();