Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1caef31

Browse files
committed
Refactor Perl test code
The original code was a bit clunky; make it more amenable for furtherreuse by creating a new Perl package PostgresNode, which is anobject-oriented representation of a single server, with some supportroutines such as init, start, stop, psql. This serves as a better basison which to build further test code, and enables writing tests that usemore than one server without too much complication.This commit modifies a lot of the existing test files, mostly to removeexplicit calls to system commands (pg_ctl) replacing them with methodcalls of a PostgresNode object. The result is quite a bit morestraightforward.Also move some initialization code to BEGIN and INIT blocks instead ofhaving it straight in as top-level code.This commit also introduces package RecursiveCopy so that we can copywhole directories without having to depend on packages that may not bepresent on vanilla Perl 5.8 installations.I also ran perltidy on the modified files, which changes some code sitesthat are not otherwise touched by this patch. I tried to avoid this,but it ended up being more trouble than it's worth.Authors: Michael Paquier, Álvaro HerreraReview: Noah Misch
1 parentc7485a8 commit1caef31

27 files changed

+989
-549
lines changed

‎src/bin/initdb/t/001_initdb.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use strict;
66
use warnings;
7+
use PostgresNode;
78
use TestLib;
89
use Test::Moretests=> 14;
910

‎src/bin/pg_basebackup/t/010_pg_basebackup.pl

Lines changed: 107 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,26 @@
22
use warnings;
33
use Cwd;
44
use Config;
5+
use PostgresNode;
56
use TestLib;
67
use Test::Moretests=> 51;
78

89
program_help_ok('pg_basebackup');
910
program_version_ok('pg_basebackup');
1011
program_options_handling_ok('pg_basebackup');
1112

12-
my$tempdir = tempdir;
13-
start_test_server$tempdir;
13+
my$tempdir = TestLib::tempdir;
1414

15-
command_fails(['pg_basebackup'],
15+
my$node = get_new_node();
16+
17+
# Initialize node without replication settings
18+
$node->init(hba_permit_replication=> 0);
19+
$node->start;
20+
my$pgdata =$node->data_dir;
21+
22+
$node->command_fails(['pg_basebackup'],
1623
'pg_basebackup needs target directory specified');
17-
command_fails(
24+
$node->command_fails(
1825
['pg_basebackup','-D',"$tempdir/backup" ],
1926
'pg_basebackup fails because of hba');
2027

@@ -26,160 +33,191 @@
2633
close BADCHARS;
2734
}
2835

29-
configure_hba_for_replication"$tempdir/pgdata";
30-
system_or_bail'pg_ctl','-D',"$tempdir/pgdata",'reload';
36+
$node->set_replication_conf();
37+
system_or_bail'pg_ctl','-D',$pgdata,'reload';
3138

32-
command_fails(
39+
$node->command_fails(
3340
['pg_basebackup','-D',"$tempdir/backup" ],
3441
'pg_basebackup fails because of WAL configuration');
3542

36-
open CONF,">>$tempdir/pgdata/postgresql.conf";
43+
open CONF,">>$pgdata/postgresql.conf";
3744
print CONF"max_replication_slots = 10\n";
3845
print CONF"max_wal_senders = 10\n";
3946
print CONF"wal_level = archive\n";
4047
close CONF;
41-
restart_test_server;
48+
$node->restart;
4249

43-
command_ok(['pg_basebackup','-D',"$tempdir/backup" ],
50+
$node->command_ok(['pg_basebackup','-D',"$tempdir/backup" ],
4451
'pg_basebackup runs');
4552
ok(-f"$tempdir/backup/PG_VERSION",'backup was created');
4653

47-
is_deeply([sort(slurp_dir("$tempdir/backup/pg_xlog/"))],
48-
[sortqw(. .. archive_status)],
49-
'no WAL files copied');
54+
is_deeply(
55+
[sort(slurp_dir("$tempdir/backup/pg_xlog/")) ],
56+
[sortqw(. .. archive_status) ],
57+
'no WAL files copied');
5058

51-
command_ok(
59+
$node->command_ok(
5260
['pg_basebackup','-D',"$tempdir/backup2",'--xlogdir',
5361
"$tempdir/xlog2" ],
5462
'separate xlog directory');
5563
ok(-f"$tempdir/backup2/PG_VERSION",'backup was created');
5664
ok(-d"$tempdir/xlog2/",'xlog directory was created');
5765

58-
command_ok(['pg_basebackup','-D',"$tempdir/tarbackup",'-Ft' ],
66+
$node->command_ok(['pg_basebackup','-D',"$tempdir/tarbackup",'-Ft' ],
5967
'tar format');
6068
ok(-f"$tempdir/tarbackup/base.tar",'backup tar was created');
6169

62-
command_fails(
70+
$node->command_fails(
6371
['pg_basebackup','-D',"$tempdir/backup_foo",'-Fp',"-T=/foo" ],
6472
'-T with empty old directory fails');
65-
command_fails(
73+
$node->command_fails(
6674
['pg_basebackup','-D',"$tempdir/backup_foo",'-Fp',"-T/foo=" ],
6775
'-T with empty new directory fails');
68-
command_fails(
76+
$node->command_fails(
6977
['pg_basebackup','-D',"$tempdir/backup_foo",'-Fp',
7078
"-T/foo=/bar=/baz" ],
7179
'-T with multiple = fails');
72-
command_fails(
80+
$node->command_fails(
7381
['pg_basebackup','-D',"$tempdir/backup_foo",'-Fp',"-Tfoo=/bar" ],
7482
'-T with old directory not absolute fails');
75-
command_fails(
83+
$node->command_fails(
7684
['pg_basebackup','-D',"$tempdir/backup_foo",'-Fp',"-T/foo=bar" ],
7785
'-T with new directory not absolute fails');
78-
command_fails(
86+
$node->command_fails(
7987
['pg_basebackup','-D',"$tempdir/backup_foo",'-Fp',"-Tfoo" ],
8088
'-T with invalid format fails');
8189

8290
# Tar format doesn't support filenames longer than 100 bytes.
8391
my$superlongname ="superlongname_" . ("x"x100);
84-
my$superlongpath ="$tempdir/pgdata/$superlongname";
92+
my$superlongpath ="$pgdata/$superlongname";
8593

8694
open FILE,">$superlongpath"ordie"unable to create file$superlongpath";
8795
close FILE;
88-
command_fails(['pg_basebackup','-D',"$tempdir/tarbackup_l1",'-Ft' ],
96+
$node->command_fails(
97+
['pg_basebackup','-D',"$tempdir/tarbackup_l1",'-Ft' ],
8998
'pg_basebackup tar with long name fails');
90-
unlink"$tempdir/pgdata/$superlongname";
99+
unlink"$pgdata/$superlongname";
91100

92101
# The following tests test symlinks. Windows doesn't have symlinks, so
93102
# skip on Windows.
94-
SKIP: {
95-
skip"symlinks not supported on Windows", 10if ($windows_os);
103+
SKIP:
104+
{
105+
skip"symlinks not supported on Windows", 10if ($windows_os);
96106

97107
# Create a temporary directory in the system location and symlink it
98108
# to our physical temp location. That way we can use shorter names
99109
# for the tablespace directories, which hopefully won't run afoul of
100110
# the 99 character length limit.
101-
my$shorter_tempdir = tempdir_short ."/tempdir";
111+
my$shorter_tempdir =TestLib::tempdir_short ."/tempdir";
102112
symlink"$tempdir",$shorter_tempdir;
103113

104114
mkdir"$tempdir/tblspc1";
105-
psql'postgres',
106-
"CREATE TABLESPACE tblspc1 LOCATION '$shorter_tempdir/tblspc1';";
107-
psql'postgres',"CREATE TABLE test1 (a int) TABLESPACE tblspc1;";
108-
command_ok(['pg_basebackup','-D',"$tempdir/tarbackup2",'-Ft' ],
109-
'tar format with tablespaces');
115+
$node->psql('postgres',
116+
"CREATE TABLESPACE tblspc1 LOCATION '$shorter_tempdir/tblspc1';");
117+
$node->psql('postgres',"CREATE TABLE test1 (a int) TABLESPACE tblspc1;");
118+
$node->command_ok(['pg_basebackup','-D',"$tempdir/tarbackup2",'-Ft' ],
119+
'tar format with tablespaces');
110120
ok(-f"$tempdir/tarbackup2/base.tar",'backup tar was created');
111121
my@tblspc_tars =glob"$tempdir/tarbackup2/[0-9]*.tar";
112122
is(scalar(@tblspc_tars), 1,'one tablespace tar was created');
113123

114-
command_fails(
124+
$node->command_fails(
115125
['pg_basebackup','-D',"$tempdir/backup1",'-Fp' ],
116126
'plain format with tablespaces fails without tablespace mapping');
117127

118-
command_ok(
128+
$node->command_ok(
119129
['pg_basebackup','-D',"$tempdir/backup1",'-Fp',
120130
"-T$shorter_tempdir/tblspc1=$tempdir/tbackup/tblspc1" ],
121131
'plain format with tablespaces succeeds with tablespace mapping');
122132
ok(-d"$tempdir/tbackup/tblspc1",'tablespace was relocated');
123-
opendir(my$dh,"$tempdir/pgdata/pg_tblspc")ordie;
133+
opendir(my$dh,"$pgdata/pg_tblspc")ordie;
124134
ok( (grep {
125-
-l"$tempdir/backup1/pg_tblspc/$_"
126-
andreadlink"$tempdir/backup1/pg_tblspc/$_"eq
127-
"$tempdir/tbackup/tblspc1"
128-
}readdir($dh)),
135+
-l"$tempdir/backup1/pg_tblspc/$_"
136+
andreadlink"$tempdir/backup1/pg_tblspc/$_"eq
137+
"$tempdir/tbackup/tblspc1"
138+
}readdir($dh)),
129139
"tablespace symlink was updated");
130140
closedir$dh;
131141

132142
mkdir"$tempdir/tbl=spc2";
133-
psql'postgres',"DROP TABLE test1;";
134-
psql'postgres',"DROP TABLESPACE tblspc1;";
135-
psql'postgres',
136-
"CREATE TABLESPACE tblspc2 LOCATION '$shorter_tempdir/tbl=spc2';";
137-
command_ok(
143+
$node->psql('postgres',"DROP TABLE test1;");
144+
$node->psql('postgres',"DROP TABLESPACE tblspc1;");
145+
$node->psql('postgres',
146+
"CREATE TABLESPACE tblspc2 LOCATION '$shorter_tempdir/tbl=spc2';");
147+
$node->command_ok(
138148
['pg_basebackup','-D',"$tempdir/backup3",'-Fp',
139149
"-T$shorter_tempdir/tbl\\=spc2=$tempdir/tbackup/tbl\\=spc2" ],
140150
'mapping tablespace with = sign in path');
141-
ok(-d"$tempdir/tbackup/tbl=spc2",'tablespace with = sign was relocated');
142-
psql'postgres',"DROP TABLESPACE tblspc2;";
151+
ok(-d"$tempdir/tbackup/tbl=spc2",
152+
'tablespace with = sign was relocated');
153+
$node->psql('postgres',"DROP TABLESPACE tblspc2;");
143154

144155
mkdir"$tempdir/$superlongname";
145-
psql'postgres',
146-
"CREATE TABLESPACE tblspc3 LOCATION '$tempdir/$superlongname';";
147-
command_ok(['pg_basebackup','-D',"$tempdir/tarbackup_l3",'-Ft' ],
148-
'pg_basebackup tar with long symlink target');
149-
psql'postgres',"DROP TABLESPACE tblspc3;";
156+
$node->psql('postgres',
157+
"CREATE TABLESPACE tblspc3 LOCATION '$tempdir/$superlongname';");
158+
$node->command_ok(
159+
['pg_basebackup','-D',"$tempdir/tarbackup_l3",'-Ft' ],
160+
'pg_basebackup tar with long symlink target');
161+
$node->psql('postgres',"DROP TABLESPACE tblspc3;");
150162
}
151163

152-
command_ok(['pg_basebackup','-D',"$tempdir/backupR",'-R' ],
164+
$node->command_ok(['pg_basebackup','-D',"$tempdir/backupR",'-R' ],
153165
'pg_basebackup -R runs');
154166
ok(-f"$tempdir/backupR/recovery.conf",'recovery.conf was created');
155167
my$recovery_conf = slurp_file"$tempdir/backupR/recovery.conf";
168+
156169
# using a character class for the final "'" here works around an apparent
157170
# bug in several version of the Msys DTK perl
158-
like($recovery_conf,qr/^standby_mode = 'on[']$/m,'recovery.conf sets standby_mode');
159-
like($recovery_conf,qr/^primary_conninfo = '.*port=$ENV{PGPORT}.*'$/m,'recovery.conf sets primary_conninfo');
160-
161-
command_ok(['pg_basebackup','-D',"$tempdir/backupxf",'-X','fetch' ],
171+
like(
172+
$recovery_conf,
173+
qr/^standby_mode = 'on[']$/m,
174+
'recovery.conf sets standby_mode');
175+
like(
176+
$recovery_conf,
177+
qr/^primary_conninfo = '.*port=$ENV{PGPORT}.*'$/m,
178+
'recovery.conf sets primary_conninfo');
179+
180+
$node->command_ok(
181+
['pg_basebackup','-D',"$tempdir/backupxf",'-X','fetch' ],
162182
'pg_basebackup -X fetch runs');
163-
ok(grep(/^[0-9A-F]{24}$/, slurp_dir("$tempdir/backupxf/pg_xlog")),'WAL files copied');
164-
command_ok(['pg_basebackup','-D',"$tempdir/backupxs",'-X','stream' ],
183+
ok(grep(/^[0-9A-F]{24}$/, slurp_dir("$tempdir/backupxf/pg_xlog")),
184+
'WAL files copied');
185+
$node->command_ok(
186+
['pg_basebackup','-D',"$tempdir/backupxs",'-X','stream' ],
165187
'pg_basebackup -X stream runs');
166-
ok(grep(/^[0-9A-F]{24}$/, slurp_dir("$tempdir/backupxf/pg_xlog")),'WAL files copied');
188+
ok(grep(/^[0-9A-F]{24}$/, slurp_dir("$tempdir/backupxf/pg_xlog")),
189+
'WAL files copied');
167190

168-
command_fails(['pg_basebackup','-D',"$tempdir/fail",'-S','slot1' ],
191+
$node->command_fails(
192+
['pg_basebackup','-D',"$tempdir/fail",'-S','slot1' ],
169193
'pg_basebackup with replication slot fails without -X stream');
170-
command_fails(['pg_basebackup','-D',"$tempdir/backupxs_sl_fail",'-X','stream','-S','slot1' ],
194+
$node->command_fails(
195+
['pg_basebackup','-D',
196+
"$tempdir/backupxs_sl_fail",'-X',
197+
'stream','-S',
198+
'slot1' ],
171199
'pg_basebackup fails with nonexistent replication slot');
172200

173-
psql'postgres',q{SELECT * FROM pg_create_physical_replication_slot('slot1')};
174-
my$lsn = psql'postgres',q{SELECT restart_lsn FROM pg_replication_slots WHERE slot_name = 'slot1'};
201+
$node->psql('postgres',
202+
q{SELECT * FROM pg_create_physical_replication_slot('slot1')});
203+
my$lsn =$node->psql('postgres',
204+
q{SELECT restart_lsn FROM pg_replication_slots WHERE slot_name = 'slot1'}
205+
);
175206
is($lsn,'','restart LSN of new slot is null');
176-
command_ok(['pg_basebackup','-D',"$tempdir/backupxs_sl",'-X','stream','-S','slot1' ],
207+
$node->command_ok(
208+
['pg_basebackup','-D',"$tempdir/backupxs_sl",'-X',
209+
'stream','-S','slot1' ],
177210
'pg_basebackup -X stream with replication slot runs');
178-
$lsn = psql'postgres',q{SELECT restart_lsn FROM pg_replication_slots WHERE slot_name = 'slot1'};
211+
$lsn =$node->psql('postgres',
212+
q{SELECT restart_lsn FROM pg_replication_slots WHERE slot_name = 'slot1'}
213+
);
179214
like($lsn,qr!^0/[0-9A-Z]{7,8}$!,'restart LSN of slot has advanced');
180215

181-
command_ok(['pg_basebackup','-D',"$tempdir/backupxs_sl_R",'-X','stream','-S','slot1','-R' ],
216+
$node->command_ok(
217+
['pg_basebackup','-D',"$tempdir/backupxs_sl_R",'-X',
218+
'stream','-S','slot1','-R' ],
182219
'pg_basebackup with replication slot and -R runs');
183-
like(slurp_file("$tempdir/backupxs_sl_R/recovery.conf"),
184-
qr/^primary_slot_name = 'slot1'$/m,
185-
'recovery.conf sets primary_slot_name');
220+
like(
221+
slurp_file("$tempdir/backupxs_sl_R/recovery.conf"),
222+
qr/^primary_slot_name = 'slot1'$/m,
223+
'recovery.conf sets primary_slot_name');
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
use strict;
22
use warnings;
3+
use PostgresNode;
34
use TestLib;
45
use Test::Moretests=> 13;
56

6-
my$tempdir = TestLib::tempdir;
7-
87
program_help_ok('pg_controldata');
98
program_version_ok('pg_controldata');
109
program_options_handling_ok('pg_controldata');
1110
command_fails(['pg_controldata'],'pg_controldata without arguments fails');
1211
command_fails(['pg_controldata','nonexistent' ],
1312
'pg_controldata with nonexistent directory fails');
14-
standard_initdb"$tempdir/data";
15-
command_like(['pg_controldata',"$tempdir/data" ],
13+
14+
my$node = get_new_node();
15+
$node->init;
16+
$node->start;
17+
18+
command_like(['pg_controldata',$node->data_dir ],
1619
qr/checkpoint/,'pg_controldata produces output');

‎src/bin/pg_ctl/t/001_start_stop.pl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use strict;
22
use warnings;
3+
34
use Config;
5+
use PostgresNode;
46
use TestLib;
57
use Test::Moretests=> 17;
68

@@ -16,13 +18,11 @@
1618

1719
command_ok(['pg_ctl','initdb','-D',"$tempdir/data",'-o','-N' ],
1820
'pg_ctl initdb');
19-
command_ok(
20-
[$ENV{PG_REGRESS},'--config-auth',
21-
"$tempdir/data" ],
21+
command_ok([$ENV{PG_REGRESS},'--config-auth',"$tempdir/data" ],
2222
'configure authentication');
2323
open CONF,">>$tempdir/data/postgresql.conf";
2424
print CONF"fsync = off\n";
25-
if (!$windows_os)
25+
if (!$windows_os)
2626
{
2727
print CONF"listen_addresses = ''\n";
2828
print CONF"unix_socket_directories = '$tempdir_short'\n";
@@ -34,6 +34,7 @@
3434
close CONF;
3535
command_ok(['pg_ctl','start','-D',"$tempdir/data",'-w' ],
3636
'pg_ctl start -w');
37+
3738
# sleep here is because Windows builds can't check postmaster.pid exactly,
3839
# so they may mistake a pre-existing postmaster.pid for one created by the
3940
# postmaster they start. Waiting more than the 2 seconds slop time allowed

‎src/bin/pg_ctl/t/002_status.pl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
use strict;
22
use warnings;
3+
4+
use PostgresNode;
35
use TestLib;
46
use Test::Moretests=> 3;
57

@@ -9,14 +11,15 @@
911
command_exit_is(['pg_ctl','status','-D',"$tempdir/nonexistent" ],
1012
4,'pg_ctl status with nonexistent directory');
1113

12-
standard_initdb"$tempdir/data";
14+
my$node = get_new_node();
15+
$node->init;
1316

14-
command_exit_is(['pg_ctl','status','-D',"$tempdir/data" ],
17+
command_exit_is(['pg_ctl','status','-D',$node->data_dir ],
1518
3,'pg_ctl status with server not running');
1619

1720
system_or_bail'pg_ctl','-l',"$tempdir/logfile",'-D',
18-
"$tempdir/data",'-w','start';
19-
command_exit_is(['pg_ctl','status','-D',"$tempdir/data" ],
21+
$node->data_dir,'-w','start';
22+
command_exit_is(['pg_ctl','status','-D',$node->data_dir ],
2023
0,'pg_ctl status with server running');
2124

22-
system_or_bail'pg_ctl','stop','-D',"$tempdir/data",'-m','fast';
25+
system_or_bail'pg_ctl','stop','-D',$node->data_dir,'-m','fast';

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp