database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-22 02:52:08 +03:00
Code Activity

Cleanup some problems in new Perl test code

Browse Source 
Noted by Tom Lane:
- PostgresNode had a BEGIN block which created files, contrary to
  perlmod suggestions to do that only on INIT blocks.
- Assign ports randomly rather than starting from 90600.

Noted by Noah Misch:
- Change use of no-longer-set PGPORT environment variable to $node->port
- Don't start a server in pg_controldata test
- PostgresNode was reading the PID file incorrectly; test the right
  thing, and chomp the line we read from the PID file.
- Remove an unused $devnull variable
- Use 'pg_ctl kill' instead of "kill" directly, for Windos portability.
- Make server log names more informative.

Author: Michael Paquier
This commit is contained in:
Alvaro Herrera
2015-12-07 19:25:31 -03:00
parent b0cfb02cec
commit 9821492ee4
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/pg_basebackup/t/010_pg_basebackup.pl
View File

@ -168,13 +168,14 @@ my $recovery_conf = slurp_file "$tempdir/backupR/recovery.conf";
# using a character class for the final "'" here works around an apparent # using a character class for the final "'" here works around an apparent
# bug in several version of the Msys DTK perl # bug in several version of the Msys DTK perl
my $port = $node->port;
like( like(
$recovery_conf, $recovery_conf,
qr/^standby_mode = 'on[']$/m, qr/^standby_mode = 'on[']$/m,
'recovery.conf sets standby_mode'); 'recovery.conf sets standby_mode');
like( like(
$recovery_conf, $recovery_conf,
qr/^primary_conninfo = '.*port=$ENV{PGPORT}.*'$/m, qr/^primary_conninfo = '.*port=$port.*'$/m,
'recovery.conf sets primary_conninfo'); 'recovery.conf sets primary_conninfo');
$node->command_ok( $node->command_ok(

1
src/bin/pg_controldata/t/001_pg_controldata.pl
View File

@ -13,7 +13,6 @@ command_fails([ 'pg_controldata', 'nonexistent' ],
my $node = get_new_node(); my $node = get_new_node();
$node->init; $node->init;
$node->start;
command_like([ 'pg_controldata', $node->data_dir ], command_like([ 'pg_controldata', $node->data_dir ],
qr/checkpoint/, 'pg_controldata produces output'); qr/checkpoint/, 'pg_controldata produces output');

29
src/test/perl/PostgresNode.pm
View File

@ -27,9 +27,8 @@ our @EXPORT = qw(
our ($test_pghost, $last_port_assigned, @all_nodes); our ($test_pghost, $last_port_assigned, @all_nodes);
BEGIN INIT
{ {
# PGHOST is set once and for all through a single series of tests when # PGHOST is set once and for all through a single series of tests when
# this module is loaded. # this module is loaded.
$test_pghost = $test_pghost =
@ -38,11 +37,7 @@ BEGIN
$ENV{PGDATABASE} = 'postgres'; $ENV{PGDATABASE} = 'postgres';
# Tracking of last port value assigned to accelerate free port lookup. # Tracking of last port value assigned to accelerate free port lookup.
# XXX: Should this use PG_VERSION_NUM? $last_port_assigned = int(rand() * 16384) + 49152;
$last_port_assigned = 90600 % 16384 + 49152;
# Node tracking
@all_nodes = ();
} }
sub new sub new
@ -50,12 +45,14 @@ sub new
my $class = shift; my $class = shift;
my $pghost = shift; my $pghost = shift;
my $pgport = shift; my $pgport = shift;
my $testname = basename($0);
$testname =~ s/\.[^.]+$//;
my $self = { my $self = {
_port => $pgport, _port => $pgport,
_host => $pghost, _host => $pghost,
_basedir => TestLib::tempdir, _basedir => TestLib::tempdir,
_applname => "node_$pgport", _applname => "node_$pgport",
_logfile => "$TestLib::log_path/node_$pgport.log" }; _logfile => "$TestLib::log_path/${testname}_node_${pgport}.log" };
bless $self, $class; bless $self, $class;
$self->dump_info; $self->dump_info;
@ -297,17 +294,16 @@ sub _update_pid
# If we can open the PID file, read its first line and that's the PID we # If we can open the PID file, read its first line and that's the PID we
# want. If the file cannot be opened, presumably the server is not # want. If the file cannot be opened, presumably the server is not
# running; don't be noisy in that case. # running; don't be noisy in that case.
open my $pidfile, $self->data_dir . "/postmaster.pid"; if (open my $pidfile, $self->data_dir . "/postmaster.pid")
if (not defined $pidfile)
{ {
$self->{_pid} = undef; chomp($self->{_pid} = <$pidfile>);
print "# No postmaster PID\n"; print "# Postmaster PID is $self->{_pid}\n";
close $pidfile;
return; return;
} }
$self->{_pid} = <$pidfile>; $self->{_pid} = undef;
print "# Postmaster PID is $self->{_pid}\n"; print "# No postmaster PID\n";
close $pidfile;
} }
# #
@ -327,7 +323,6 @@ sub get_new_node
{ {
$port++; $port++;
print "# Checking for port $port\n"; print "# Checking for port $port\n";
my $devnull = $TestLib::windows_os ? "nul" : "/dev/null";
if (!TestLib::run_log([ 'pg_isready', '-p', $port ])) if (!TestLib::run_log([ 'pg_isready', '-p', $port ]))
{ {
$found = 1; $found = 1;
@ -360,7 +355,7 @@ sub DESTROY
my $self = shift; my $self = shift;
return if not defined $self->{_pid}; return if not defined $self->{_pid};
print "# signalling QUIT to $self->{_pid}\n"; print "# signalling QUIT to $self->{_pid}\n";
kill 'QUIT', $self->{_pid}; TestLib::system_log('pg_ctl', 'kill', 'QUIT', $self->{_pid});
} }
sub teardown_node sub teardown_node