Skip to content

Commit effea35

Browse files
gsmolkgsmolk
committed
tests: support PG12
1 parent af42fbf commit effea35

File tree

15 files changed

+197
-200
lines changed

15 files changed

+197
-200
lines changed

‎tests/archive.py‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,7 @@ def test_pgpro434_3(self):
245245
gdb.set_breakpoint('pg_stop_backup')
246246
gdb.run_until_break()
247247

248-
node.append_conf(
249-
'postgresql.auto.conf', "archive_command = 'exit 1'")
248+
self.set_auto_conf(node, {'archive_command': "'exit 1'"})
250249
node.reload()
251250

252251
gdb.continue_execution_until_exit()
@@ -306,8 +305,7 @@ def test_pgpro434_4(self):
306305
gdb.set_breakpoint('pg_stop_backup')
307306
gdb.run_until_break()
308307

309-
node.append_conf(
310-
'postgresql.auto.conf', "archive_command = 'exit 1'")
308+
self.set_auto_conf(node, {'archive_command': "'exit 1'"})
311309
node.reload()
312310

313311
os.environ["PGAPPNAME"] = "foo"
@@ -741,8 +739,8 @@ def test_replica_archive(self):
741739
base_dir=os.path.join(module_name, fname, 'node'))
742740
node.cleanup()
743741
self.restore_node(backup_dir, 'replica', data_dir=node.data_dir)
744-
node.append_conf(
745-
'postgresql.auto.conf', 'port = {0}'.format(node.port))
742+
743+
self.set_auto_conf(node, {'port': node.port})
746744
node.slow_start()
747745
# CHECK DATA CORRECTNESS
748746
after = node.safe_psql("postgres", "SELECT * FROM t_heap")
@@ -784,8 +782,7 @@ def test_replica_archive(self):
784782
self.restore_node(
785783
backup_dir, 'replica', data_dir=node.data_dir, backup_id=backup_id)
786784

787-
node.append_conf(
788-
'postgresql.auto.conf', 'port = {0}'.format(node.port))
785+
self.set_auto_conf(node, {'port': node.port})
789786

790787
node.slow_start()
791788
# CHECK DATA CORRECTNESS

‎tests/auth_test.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ def test_backup_via_unprivileged_user(self):
124124
node.safe_psql(
125125
"test1", "create table t1 as select generate_series(0,100)")
126126

127-
node.append_conf("postgresql.auto.conf", "ptrack_enable = 'on'")
127+
if self.ptrack:
128+
self.set_auto_conf(node, {'ptrack_enable': 'on'})
128129
node.stop()
129130
node.slow_start()
130131

‎tests/backup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,7 +1539,7 @@ def test_backup_with_least_privileges_role(self):
15391539
'archive_timeout': '30s'})
15401540

15411541
if self.ptrack:
1542-
node.append_conf('postgresql.auto.conf', 'ptrack_enable = on')
1542+
self.set_auto_conf(node, {'ptrack_enable': 'on'})
15431543

15441544
self.init_pb(backup_dir)
15451545
self.add_instance(backup_dir, 'node', node)
@@ -1909,7 +1909,7 @@ def test_backup_with_less_privileges_role(self):
19091909
'checkpoint_timeout': '1h'})
19101910

19111911
if self.ptrack:
1912-
node.append_conf('postgresql.auto.conf', 'ptrack_enable = on')
1912+
self.set_auto_conf(node, {'ptrack_enable': 'on'})
19131913

19141914
self.init_pb(backup_dir)
19151915
self.add_instance(backup_dir, 'node', node)

‎tests/cfs_restore.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,7 @@ def test_restore_from_fullbackup_to_new_location(self):
216216

217217
try:
218218
self.restore_node(self.backup_dir, 'node', node_new, backup_id=self.backup_id)
219-
node_new.append_conf("postgresql.auto.conf",
220-
"port = {0}".format(node_new.port))
219+
self.set_auto_conf(node_new, {'port': node_new.port})
221220
except ProbackupException as e:
222221
self.fail(
223222
"ERROR: Restore from full backup failed. \n {0} \n {1}".format(
@@ -260,8 +259,7 @@ def test_restore_from_fullbackup_to_new_location_5_jobs(self):
260259

261260
try:
262261
self.restore_node(self.backup_dir, 'node', node_new, backup_id=self.backup_id, options=['-j', '5'])
263-
node_new.append_conf("postgresql.auto.conf",
264-
"port = {0}".format(node_new.port))
262+
self.set_auto_conf(node_new, {'port': node_new.port})
265263
except ProbackupException as e:
266264
self.fail(
267265
"ERROR: Restore from full backup failed. \n {0} \n {1}".format(

‎tests/delete.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,7 @@ def test_delete_wal_between_multiple_timelines(self):
332332
node2.cleanup()
333333

334334
self.restore_node(backup_dir, 'node', node2)
335-
node2.append_conf(
336-
'postgresql.auto.conf', "port = {0}".format(node2.port))
335+
self.set_auto_conf(node, {'port': node2.port})
337336
node2.slow_start()
338337

339338
# load some more data to node

‎tests/delta.py‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ def test_basic_delta_vacuum_truncate(self):
8484
pgdata_restored = self.pgdata_content(node_restored.data_dir)
8585
self.compare_pgdata(pgdata, pgdata_restored)
8686

87-
node_restored.append_conf(
88-
"postgresql.auto.conf", "port = {0}".format(node_restored.port))
87+
self.set_auto_conf(node_restored, {'port': node_restored.port})
8988
node_restored.slow_start()
9089

9190
# Clean after yourself
@@ -173,8 +172,7 @@ def test_delta_vacuum_truncate_1(self):
173172
pgdata_restored = self.pgdata_content(node_restored.data_dir)
174173
self.compare_pgdata(pgdata, pgdata_restored)
175174

176-
node_restored.append_conf(
177-
"postgresql.auto.conf", "port = {0}".format(node_restored.port))
175+
self.set_auto_conf(node_restored, {'port': node_restored.port})
178176
node_restored.slow_start()
179177

180178
# Clean after yourself
@@ -226,25 +224,21 @@ def test_delta_vacuum_truncate_2(self):
226224
os.unlink(os.path.join(node.data_dir, filepath + '.1'))
227225

228226
self.backup_node(
229-
backup_dir, 'node', node, backup_type='delta'
230-
)
227+
backup_dir, 'node', node, backup_type='delta')
231228

232229
self.backup_node(
233-
backup_dir, 'node', node, backup_type='delta'
234-
)
230+
backup_dir, 'node', node, backup_type='delta')
235231

236232
pgdata = self.pgdata_content(node.data_dir)
237233

238234
self.restore_node(
239-
backup_dir, 'node', node_restored
240-
)
235+
backup_dir, 'node', node_restored)
241236

242237
# Physical comparison
243238
pgdata_restored = self.pgdata_content(node_restored.data_dir)
244239
self.compare_pgdata(pgdata, pgdata_restored)
245240

246-
node_restored.append_conf(
247-
"postgresql.auto.conf", "port = {0}".format(node_restored.port))
241+
self.set_auto_conf(node_restored, {'port': node_restored.port})
248242
node_restored.slow_start()
249243

250244
# Clean after yourself
@@ -473,8 +467,7 @@ def test_delta_multiple_segments(self):
473467
pgdata_restored = self.pgdata_content(restored_node.data_dir)
474468

475469
# START RESTORED NODE
476-
restored_node.append_conf(
477-
"postgresql.auto.conf", "port = {0}".format(restored_node.port))
470+
self.set_auto_conf(restored_node, {'port': restored_node.port})
478471
restored_node.slow_start()
479472

480473
result_new = restored_node.safe_psql(
@@ -563,8 +556,7 @@ def test_delta_vacuum_full(self):
563556
pgdata_restored = self.pgdata_content(node_restored.data_dir)
564557
self.compare_pgdata(pgdata, pgdata_restored)
565558

566-
node_restored.append_conf(
567-
"postgresql.auto.conf", "port = {0}".format(node_restored.port))
559+
self.set_auto_conf(node_restored, {'port': node_restored.port})
568560

569561
node_restored.slow_start()
570562

@@ -644,8 +636,7 @@ def test_create_db(self):
644636
self.compare_pgdata(pgdata, pgdata_restored)
645637

646638
# START RESTORED NODE
647-
node_restored.append_conf(
648-
"postgresql.auto.conf", "port = {0}".format(node_restored.port))
639+
self.set_auto_conf(node_restored, {'port': node_restored.port})
649640
node_restored.slow_start()
650641

651642
# DROP DATABASE DB1
@@ -679,8 +670,7 @@ def test_create_db(self):
679670
self.compare_pgdata(pgdata, pgdata_restored)
680671

681672
# START RESTORED NODE
682-
node_restored.append_conf(
683-
"postgresql.auto.conf", "port = {0}".format(node_restored.port))
673+
self.set_auto_conf(node_restored, {'port': node_restored.port})
684674
node_restored.slow_start()
685675

686676
try:
@@ -801,8 +791,7 @@ def test_exists_in_previous_backup(self):
801791
self.compare_pgdata(pgdata, pgdata_restored)
802792

803793
# START RESTORED NODE
804-
node_restored.append_conf(
805-
"postgresql.auto.conf", "port = {0}".format(node_restored.port))
794+
self.set_auto_conf(node_restored, {'port': node_restored.port})
806795
node_restored.slow_start()
807796

808797
# Clean after yourself
@@ -883,8 +872,7 @@ def test_alter_table_set_tablespace_delta(self):
883872
self.compare_pgdata(pgdata, pgdata_restored)
884873

885874
# START RESTORED NODE
886-
node_restored.append_conf(
887-
'postgresql.auto.conf', 'port = {0}'.format(node_restored.port))
875+
self.set_auto_conf(node_restored, {'port': node_restored.port})
888876
node_restored.slow_start()
889877

890878
result_new = node_restored.safe_psql(
@@ -981,8 +969,7 @@ def test_alter_database_set_tablespace_delta(self):
981969
self.compare_pgdata(pgdata, pgdata_restored)
982970

983971
# START RESTORED NODE
984-
node_restored.append_conf(
985-
'postgresql.auto.conf', 'port = {0}'.format(node_restored.port))
972+
self.set_auto_conf(node_restored, {'port': node_restored.port})
986973
node_restored.slow_start()
987974

988975
# Clean after yourself
@@ -1065,8 +1052,7 @@ def test_delta_delete(self):
10651052
self.compare_pgdata(pgdata, pgdata_restored)
10661053

10671054
# START RESTORED NODE
1068-
node_restored.append_conf(
1069-
'postgresql.auto.conf', 'port = {0}'.format(node_restored.port))
1055+
self.set_auto_conf(node_restored, {'port': node_restored.port})
10701056
node_restored.slow_start()
10711057

10721058
# Clean after yourself

0 commit comments

Comments
 (0)