Skip to content

Commit f549245

Browse files
gsmolkgsmolk
committed
tests: minor changes for 9.5
1 parent 46d0db2 commit f549245

File tree

4 files changed

+30
-25
lines changed

4 files changed

+30
-25
lines changed

‎tests/archive.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ def test_master_and_replica_concurrent_archiving(self):
640640
set_replication=True,
641641
initdb_params=['--data-checksums'],
642642
pg_options={
643-
'wal_level': 'replica',
643+
'wal_level': 'logical',
644644
'max_wal_senders': '2',
645645
'checkpoint_timeout': '30s'}
646646
)
@@ -668,7 +668,9 @@ def test_master_and_replica_concurrent_archiving(self):
668668
pgdata_master = self.pgdata_content(master.data_dir)
669669

670670
# Settings for Replica
671-
self.restore_node(backup_dir, 'master', replica)
671+
self.restore_node(
672+
backup_dir, 'master', replica,
673+
options=['--recovery-target-action=promote'])
672674
# CHECK PHYSICAL CORRECTNESS on REPLICA
673675
pgdata_replica = self.pgdata_content(replica.data_dir)
674676
self.compare_pgdata(pgdata_master, pgdata_replica)
@@ -723,7 +725,7 @@ def test_archive_pg_receivexlog(self):
723725
set_replication=True,
724726
initdb_params=['--data-checksums'],
725727
pg_options={
726-
'wal_level': 'replica',
728+
'wal_level': 'logical',
727729
'max_wal_senders': '2',
728730
'checkpoint_timeout': '30s'}
729731
)

‎tests/helpers/ptrack_helpers.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,12 @@ def make_simple_node(
208208
node.init(
209209
initdb_params=initdb_params, allow_streaming=set_replication)
210210

211-
# Sane default parameters, not a shit with fsync = off from testgres
211+
# Sane default parameters
212212
node.append_conf("postgresql.auto.conf", "max_connections = 100")
213213
node.append_conf("postgresql.auto.conf", "shared_buffers = 10MB")
214214
node.append_conf("postgresql.auto.conf", "fsync = on")
215215
node.append_conf("postgresql.auto.conf", "wal_level = minimal")
216+
node.append_conf("postgresql.auto.conf", "hot_standby = 'off'")
216217

217218
node.append_conf(
218219
"postgresql.auto.conf", "log_line_prefix = '%t [%p]: [%l-1] '")
@@ -742,10 +743,10 @@ def set_archiving(
742743
else:
743744
archive_mode = 'on'
744745

745-
node.append_conf(
746-
"postgresql.auto.conf",
747-
"wal_level = archive"
748-
)
746+
# node.append_conf(
747+
# "postgresql.auto.conf",
748+
# "wal_level = archive"
749+
# )
749750
node.append_conf(
750751
"postgresql.auto.conf",
751752
"archive_mode = {0}".format(archive_mode)

‎tests/option_test.py‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,8 @@ def test_options_4(self):
5050
"""check options test"""
5151
fname = self.id().split(".")[3]
5252
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
53-
node = self.make_simple_node(base_dir="{0}/{1}/node".format(module_name, fname),
54-
pg_options={'wal_level': 'replica', 'max_wal_senders': '2'})
55-
try:
56-
node.stop()
57-
except:
58-
pass
53+
node = self.make_simple_node(
54+
base_dir="{0}/{1}/node".format(module_name, fname))
5955

6056
self.init_pb(backup_dir)
6157
self.add_instance(backup_dir, 'node', node)
@@ -113,15 +109,18 @@ def test_options_4(self):
113109
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(repr(e.message), self.cmd))
114110

115111
# Clean after yourself
116-
self.del_test_dir(module_name, fname)
112+
# self.del_test_dir(module_name, fname)
117113

118-
#@unittest.skip("skip")
114+
# @unittest.skip("skip")
119115
def test_options_5(self):
120116
"""check options test"""
121117
fname = self.id().split(".")[3]
122118
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
123-
node = self.make_simple_node(base_dir="{0}/{1}/node".format(module_name, fname),
124-
pg_options={'wal_level': 'replica', 'max_wal_senders': '2'})
119+
node = self.make_simple_node(
120+
base_dir="{0}/{1}/node".format(module_name, fname),
121+
pg_options={
122+
'wal_level': 'logical',
123+
'max_wal_senders': '2'})
125124

126125
self.assertEqual("INFO: Backup catalog '{0}' successfully inited\n".format(backup_dir),
127126
self.init_pb(backup_dir))

‎tests/page.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ def test_page_stream(self):
133133
pg_options={
134134
'wal_level': 'replica',
135135
'max_wal_senders': '2',
136-
'checkpoint_timeout': '30s',
137-
'ptrack_enable': 'on'}
136+
'checkpoint_timeout': '30s'}
138137
)
139138

140139
self.init_pb(backup_dir)
@@ -213,8 +212,7 @@ def test_page_archive(self):
213212
pg_options={
214213
'wal_level': 'replica',
215214
'max_wal_senders': '2',
216-
'checkpoint_timeout': '30s',
217-
'ptrack_enable': 'on'}
215+
'checkpoint_timeout': '30s'}
218216
)
219217

220218
self.init_pb(backup_dir)
@@ -250,7 +248,10 @@ def test_page_archive(self):
250248
self.restore_node(
251249
backup_dir, 'node', node,
252250
backup_id=full_backup_id,
253-
options=["-j", "4"]),
251+
options=[
252+
"-j", "4",
253+
"--immediate",
254+
"--recovery-target-action=promote"]),
254255
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
255256
repr(self.output), self.cmd))
256257
node.start()
@@ -264,7 +265,10 @@ def test_page_archive(self):
264265
self.restore_node(
265266
backup_dir, 'node', node,
266267
backup_id=page_backup_id,
267-
options=["-j", "4"]),
268+
options=[
269+
"-j", "4",
270+
"--immediate",
271+
"--recovery-target-action=promote"]),
268272
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
269273
repr(self.output), self.cmd))
270274
node.start()
@@ -290,7 +294,6 @@ def test_page_multiple_segments(self):
290294
pg_options={
291295
'wal_level': 'replica',
292296
'max_wal_senders': '2',
293-
'ptrack_enable': 'on',
294297
'fsync': 'off',
295298
'shared_buffers': '1GB',
296299
'maintenance_work_mem': '1GB',

0 commit comments

Comments
 (0)