Skip to content

Commit 86edb37

Browse files
jeltzjeltz
committed
Clean up setting of PostgreSQL config in TAP tests
Some of our tests wrote directly to the config file while others used the append_conf() helper. Consistently use the helper, group multiple GUCs into one call and remove unnecessary newlines. Additionally we standardize boolean GUCs to on/off and fix a couple of comments.
1 parent c6bd49c commit 86edb37

34 files changed

Lines changed: 282 additions & 364 deletions

‎t/001_settings_default.pl‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@
1414

1515
# CREATE new PostgreSQL node and do initdb
1616
my $node = PGSM->pgsm_init_pg();
17-
my $pgdata = $node->data_dir;
1817

19-
# UPDATE postgresql.conf to include/load pg_stat_monitor library
20-
open my $conf, '>>', "$pgdata/postgresql.conf";
21-
print $conf "shared_preload_libraries = 'pg_stat_monitor'\n";
22-
close $conf;
18+
$node->append_conf('postgresql.conf',
19+
"shared_preload_libraries = 'pg_stat_monitor'");
2320

2421
# Start server
2522
$node->start;

‎t/002_settings_pgsm_track_planning.pl‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515

1616
# CREATE new PostgreSQL node and do initdb
1717
my $node = PGSM->pgsm_init_pg();
18-
my $pgdata = $node->data_dir;
1918

20-
# UPDATE postgresql.conf to include/load pg_stat_monitor library
21-
open my $conf, '>>', "$pgdata/postgresql.conf";
22-
print $conf "shared_preload_libraries = 'pg_stat_monitor'\n";
23-
print $conf "pg_stat_monitor.pgsm_track_planning = on\n";
24-
close $conf;
19+
$node->append_conf(
20+
'postgresql.conf', qq(
21+
shared_preload_libraries = 'pg_stat_monitor'
22+
pg_stat_monitor.pgsm_track_planning = on
23+
));
2524

2625
# Start server
2726
$node->start;
@@ -129,7 +128,7 @@
129128

130129
# Disable pgsm_track_planning
131130
$node->append_conf('postgresql.conf',
132-
"pg_stat_monitor.pgsm_track_planning = 'no'\n");
131+
'pg_stat_monitor.pgsm_track_planning = off');
133132
$node->restart();
134133

135134
# Dump output to out file

‎t/003_settings_pgms_extract_comments.pl‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414

1515
# CREATE new PostgreSQL node and do initdb
1616
my $node = PGSM->pgsm_init_pg();
17-
my $pgdata = $node->data_dir;
1817

19-
# UPDATE postgresql.conf to include/load pg_stat_monitor library
20-
open my $conf, '>>', "$pgdata/postgresql.conf";
21-
print $conf "shared_preload_libraries = 'pg_stat_monitor'\n";
22-
print $conf "pg_stat_monitor.pgsm_extract_comments = on\n";
23-
close $conf;
18+
$node->append_conf(
19+
'postgresql.conf', qq(
20+
shared_preload_libraries = 'pg_stat_monitor'
21+
pg_stat_monitor.pgsm_extract_comments = on
22+
));
2423

2524
# Start server
2625
$node->start;
@@ -67,7 +66,7 @@
6766
PGSM::append_to_file($stdout);
6867

6968
$node->append_conf('postgresql.conf',
70-
"pg_stat_monitor.pgsm_extract_comments = 'no'\n");
69+
'pg_stat_monitor.pgsm_extract_comments = off');
7170
$node->restart();
7271

7372
($cmdret, $stdout, $stderr) = $node->psql(

‎t/004_settings_pgsm_track.pl‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414

1515
# CREATE new PostgreSQL node and do initdb
1616
my $node = PGSM->pgsm_init_pg();
17-
my $pgdata = $node->data_dir;
1817

19-
# UPDATE postgresql.conf to include/load pg_stat_monitor library
20-
open my $conf, '>>', "$pgdata/postgresql.conf";
21-
print $conf "shared_preload_libraries = 'pg_stat_monitor'\n";
22-
print $conf "pg_stat_monitor.pgsm_track = 'none'\n";
23-
close $conf;
18+
$node->append_conf(
19+
'postgresql.conf', qq(
20+
shared_preload_libraries = 'pg_stat_monitor'
21+
pg_stat_monitor.pgsm_track = 'none'
22+
));
2423

2524
# Start server
2625
$node->start;
@@ -54,7 +53,7 @@
5453
extra_params => [ '-a', '-Pformat=aligned', '-Ptuples_only=off' ]);
5554
PGSM::append_to_file($stdout);
5655

57-
$node->append_conf('postgresql.conf', "pg_stat_monitor.pgsm_track = 'all'\n");
56+
$node->append_conf('postgresql.conf', "pg_stat_monitor.pgsm_track = 'all'");
5857
$node->restart();
5958

6059
($cmdret, $stdout, $stderr) = $node->psql(
@@ -71,7 +70,7 @@
7170
is($cmdret, 0, "Reset PGSM EXTENSION");
7271
PGSM::append_to_file($stdout);
7372

74-
$node->append_conf('postgresql.conf', "pg_stat_monitor.pgsm_track = 'top'\n");
73+
$node->append_conf('postgresql.conf', "pg_stat_monitor.pgsm_track = 'top'");
7574
$node->restart();
7675

7776
($cmdret, $stdout, $stderr) = $node->psql(

‎t/005_settings_pgsm_enable_query_plan.pl‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515

1616
# CREATE new PostgreSQL node and do initdb
1717
my $node = PGSM->pgsm_init_pg();
18-
my $pgdata = $node->data_dir;
1918

20-
# UPDATE postgresql.conf to include/load pg_stat_monitor library
21-
open my $conf, '>>', "$pgdata/postgresql.conf";
22-
print $conf "shared_preload_libraries = 'pg_stat_monitor'\n";
23-
print $conf "pg_stat_monitor.pgsm_enable_query_plan = on\n";
24-
close $conf;
19+
$node->append_conf(
20+
'postgresql.conf', qq(
21+
shared_preload_libraries = 'pg_stat_monitor'
22+
pg_stat_monitor.pgsm_enable_query_plan = on
23+
));
2524

2625
# Start server
2726
$node->start;
@@ -95,7 +94,7 @@
9594
ok(length($stdout) > 0, 'Length of planid is > 0');
9695

9796
$node->append_conf('postgresql.conf',
98-
"pg_stat_monitor.pgsm_enable_query_plan = off\n");
97+
'pg_stat_monitor.pgsm_enable_query_plan = off');
9998
$node->restart();
10099

101100
# Run required commands/queries and dump output to out file.

‎t/006_settings_pgsm_overflow_target.pl‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414

1515
# CREATE new PostgreSQL node and do initdb
1616
my $node = PGSM->pgsm_init_pg();
17-
my $pgdata = $node->data_dir;
1817

19-
# UPDATE postgresql.conf to include/load pg_stat_monitor library
20-
open my $conf, '>>', "$pgdata/postgresql.conf";
21-
print $conf "shared_preload_libraries = 'pg_stat_monitor'\n";
22-
print $conf "pg_stat_monitor.pgsm_enable_overflow = false\n";
23-
close $conf;
18+
$node->append_conf(
19+
'postgresql.conf', qq(
20+
shared_preload_libraries = 'pg_stat_monitor'
21+
pg_stat_monitor.pgsm_enable_overflow = off
22+
));
2423

2524
# Start server
2625
$node->start;
@@ -49,7 +48,7 @@
4948
PGSM::append_to_file($stdout);
5049

5150
$node->append_conf('postgresql.conf',
52-
"pg_stat_monitor.pgsm_enable_overflow = true\n");
51+
'pg_stat_monitor.pgsm_enable_overflow = on');
5352
$node->restart();
5453

5554
($cmdret, $stdout, $stderr) = $node->psql(

‎t/007_settings_pgsm_query_shared_buffer.pl‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414

1515
# CREATE new PostgreSQL node and do initdb
1616
my $node = PGSM->pgsm_init_pg();
17-
my $pgdata = $node->data_dir;
1817

19-
# UPDATE postgresql.conf to include/load pg_stat_monitor library
20-
open my $conf, '>>', "$pgdata/postgresql.conf";
21-
print $conf "shared_preload_libraries = 'pg_stat_monitor'\n";
22-
print $conf "pg_stat_monitor.pgsm_bucket_time = 360000\n";
23-
print $conf
24-
"pg_stat_monitor.pgsm_query_shared_buffer = 1\n"; # Min possible value
25-
print $conf "pg_stat_monitor.pgsm_normalized_query = on\n";
26-
close $conf;
18+
$node->append_conf(
19+
'postgresql.conf', qq(
20+
shared_preload_libraries = 'pg_stat_monitor'
21+
pg_stat_monitor.pgsm_bucket_time = 360000
22+
pg_stat_monitor.pgsm_query_shared_buffer = 1 # Min possible value
23+
pg_stat_monitor.pgsm_normalized_query = on
24+
));
2725

2826
# Start server
2927
$node->start;
@@ -77,7 +75,7 @@
7775
PGSM::append_to_file($stdout);
7876

7977
$node->append_conf('postgresql.conf',
80-
"pg_stat_monitor.pgsm_query_shared_buffer = 2\n");
78+
'pg_stat_monitor.pgsm_query_shared_buffer = 2');
8179
$node->restart();
8280

8381
($cmdret, $stdout, $stderr) = $node->psql(
@@ -110,7 +108,7 @@
110108
PGSM::append_to_file($stdout);
111109

112110
$node->append_conf('postgresql.conf',
113-
"pg_stat_monitor.pgsm_query_shared_buffer = 20\n");
111+
'pg_stat_monitor.pgsm_query_shared_buffer = 20');
114112
$node->restart();
115113

116114
($cmdret, $stdout, $stderr) = $node->psql(
@@ -143,7 +141,7 @@
143141
PGSM::append_to_file($stdout);
144142

145143
$node->append_conf('postgresql.conf',
146-
"pg_stat_monitor.pgsm_query_shared_buffer = 2048\n");
144+
'pg_stat_monitor.pgsm_query_shared_buffer = 2048');
147145
$node->restart();
148146

149147
($cmdret, $stdout, $stderr) = $node->psql(

‎t/008_settings_pgsm_histogram_buckets.pl‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414

1515
# CREATE new PostgreSQL node and do initdb
1616
my $node = PGSM->pgsm_init_pg();
17-
my $pgdata = $node->data_dir;
1817

19-
# UPDATE postgresql.conf to include/load pg_stat_monitor library
20-
open my $conf, '>>', "$pgdata/postgresql.conf";
21-
print $conf "shared_preload_libraries = 'pg_stat_monitor'\n";
22-
print $conf "pg_stat_monitor.pgsm_histogram_buckets = 10000\n";
23-
close $conf;
18+
$node->append_conf(
19+
'postgresql.conf', qq(
20+
shared_preload_libraries = 'pg_stat_monitor'
21+
pg_stat_monitor.pgsm_histogram_buckets = 10000
22+
));
2423

2524
# Start server
2625
$node->start;
@@ -49,7 +48,7 @@
4948
PGSM::append_to_file($stdout);
5049

5150
$node->append_conf('postgresql.conf',
52-
"pg_stat_monitor.pgsm_histogram_buckets = 1000\n");
51+
'pg_stat_monitor.pgsm_histogram_buckets = 1000');
5352
$node->restart();
5453

5554
($cmdret, $stdout, $stderr) = $node->psql(
@@ -67,7 +66,7 @@
6766
PGSM::append_to_file($stdout);
6867

6968
$node->append_conf('postgresql.conf',
70-
"pg_stat_monitor.pgsm_histogram_buckets = 100\n");
69+
'pg_stat_monitor.pgsm_histogram_buckets = 100');
7170
$node->restart();
7271

7372
($cmdret, $stdout, $stderr) = $node->psql(
@@ -85,7 +84,7 @@
8584
PGSM::append_to_file($stdout);
8685

8786
$node->append_conf('postgresql.conf',
88-
"pg_stat_monitor.pgsm_histogram_buckets = 10\n");
87+
'pg_stat_monitor.pgsm_histogram_buckets = 10');
8988
$node->restart();
9089

9190
($cmdret, $stdout, $stderr) = $node->psql(
@@ -103,7 +102,7 @@
103102
PGSM::append_to_file($stdout);
104103

105104
$node->append_conf('postgresql.conf',
106-
"pg_stat_monitor.pgsm_histogram_buckets = 5\n");
105+
'pg_stat_monitor.pgsm_histogram_buckets = 5');
107106
$node->restart();
108107

109108
($cmdret, $stdout, $stderr) = $node->psql(
@@ -121,7 +120,7 @@
121120
PGSM::append_to_file($stdout);
122121

123122
$node->append_conf('postgresql.conf',
124-
"pg_stat_monitor.pgsm_histogram_buckets = 1\n");
123+
'pg_stat_monitor.pgsm_histogram_buckets = 1');
125124
$node->restart();
126125

127126
($cmdret, $stdout, $stderr) = $node->psql(

‎t/009_settings_pgsm_histogram_max.pl‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414

1515
# CREATE new PostgreSQL node and do initdb
1616
my $node = PGSM->pgsm_init_pg();
17-
my $pgdata = $node->data_dir;
1817

19-
# UPDATE postgresql.conf to include/load pg_stat_monitor library
20-
open my $conf, '>>', "$pgdata/postgresql.conf";
21-
print $conf "shared_preload_libraries = 'pg_stat_monitor'\n";
22-
print $conf "pg_stat_monitor.pgsm_histogram_max = 1\n";
23-
close $conf;
18+
$node->append_conf(
19+
'postgresql.conf', qq(
20+
shared_preload_libraries = 'pg_stat_monitor'
21+
pg_stat_monitor.pgsm_histogram_max = 1
22+
));
2423

2524
# Start server
2625
$node->start;
@@ -49,9 +48,9 @@
4948
PGSM::append_to_file($stdout);
5049

5150
$node->append_conf('postgresql.conf',
52-
"pg_stat_monitor.pgsm_histogram_max = 50\n");
51+
'pg_stat_monitor.pgsm_histogram_max = 50');
5352
$node->append_conf('postgresql.conf',
54-
"pg_stat_monitor.pgsm_histogram_buckets = 3\n");
53+
'pg_stat_monitor.pgsm_histogram_buckets = 3');
5554
$node->restart();
5655

5756
($cmdret, $stdout, $stderr) = $node->psql(
@@ -69,7 +68,7 @@
6968
PGSM::append_to_file($stdout);
7069

7170
$node->append_conf('postgresql.conf',
72-
"pg_stat_monitor.pgsm_histogram_max = 1000\n");
71+
'pg_stat_monitor.pgsm_histogram_max = 1000');
7372
$node->restart();
7473

7574
($cmdret, $stdout, $stderr) = $node->psql(

‎t/010_settings_pgsm_histogram_min.pl‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414

1515
# CREATE new PostgreSQL node and do initdb
1616
my $node = PGSM->pgsm_init_pg();
17-
my $pgdata = $node->data_dir;
1817

19-
# UPDATE postgresql.conf to include/load pg_stat_monitor library
20-
open my $conf, '>>', "$pgdata/postgresql.conf";
21-
print $conf "shared_preload_libraries = 'pg_stat_monitor'\n";
22-
print $conf "pg_stat_monitor.pgsm_histogram_min = 1\n";
23-
close $conf;
18+
$node->append_conf(
19+
'postgresql.conf', qq(
20+
shared_preload_libraries = 'pg_stat_monitor'
21+
pg_stat_monitor.pgsm_histogram_min = 1
22+
));
2423

2524
# Start server
2625
$node->start;
@@ -49,7 +48,7 @@
4948
PGSM::append_to_file($stdout);
5049

5150
$node->append_conf('postgresql.conf',
52-
"pg_stat_monitor.pgsm_histogram_min = 20\n");
51+
'pg_stat_monitor.pgsm_histogram_min = 20');
5352
$node->restart();
5453

5554
($cmdret, $stdout, $stderr) = $node->psql(
@@ -67,7 +66,7 @@
6766
PGSM::append_to_file($stdout);
6867

6968
$node->append_conf('postgresql.conf',
70-
"pg_stat_monitor.pgsm_histogram_min = 100\n");
69+
'pg_stat_monitor.pgsm_histogram_min = 100');
7170
$node->restart();
7271

7372
($cmdret, $stdout, $stderr) = $node->psql(

0 commit comments

Comments
 (0)