Skip to content

Commit 0deff06

Browse files
gsmolkgsmolk
committed
tests: minor fixes
1 parent 9edb2e3 commit 0deff06

File tree

7 files changed

+65
-90
lines changed

7 files changed

+65
-90
lines changed

‎tests/archive.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ def test_pgpro434_1(self):
5858
node.cleanup()
5959

6060
# Restore Database
61-
self.restore_node(
62-
backup_dir, 'node', node,
63-
options=["--recovery-target-action=promote"])
61+
self.restore_node(backup_dir, 'node', node)
6462
node.slow_start()
6563

6664
self.assertEqual(
@@ -1590,11 +1588,9 @@ def test_archive_options(self):
15901588
self.restore_node(
15911589
backup_dir, 'node', node,
15921590
options=[
1593-
'--recovery-target-action=promote',
15941591
'--archive-host=localhost',
15951592
'--archive-port=22',
1596-
'--archive-user={0}'.format(self.user)
1597-
])
1593+
'--archive-user={0}'.format(self.user)])
15981594

15991595
with open(recovery_conf, 'r') as f:
16001596
recovery_content = f.read()

‎tests/compatibility.py‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ def test_backward_compatibility_page(self):
2020
set_replication=True,
2121
initdb_params=['--data-checksums'],
2222
pg_options={
23-
'autovacuum': 'off'}
24-
)
23+
'autovacuum': 'off'})
24+
2525
self.init_pb(backup_dir, old_binary=True)
2626
self.show_pb(backup_dir)
2727

@@ -51,8 +51,7 @@ def test_backward_compatibility_page(self):
5151
node_restored.cleanup()
5252

5353
self.restore_node(
54-
backup_dir, 'node', node_restored,
55-
options=["-j", "4", "--recovery-target-action=promote"])
54+
backup_dir, 'node', node_restored, options=["-j", "4"])
5655

5756
if self.paranoia:
5857
pgdata_restored = self.pgdata_content(node_restored.data_dir)
@@ -76,8 +75,7 @@ def test_backward_compatibility_page(self):
7675

7776
node_restored.cleanup()
7877
self.restore_node(
79-
backup_dir, 'node', node_restored,
80-
options=["-j", "4", "--recovery-target-action=promote"])
78+
backup_dir, 'node', node_restored, options=["-j", "4"])
8179

8280
if self.paranoia:
8381
pgdata_restored = self.pgdata_content(node_restored.data_dir)
@@ -101,8 +99,7 @@ def test_backward_compatibility_page(self):
10199
node_restored.cleanup()
102100

103101
self.restore_node(
104-
backup_dir, 'node', node_restored,
105-
options=["-j", "4", "--recovery-target-action=promote"])
102+
backup_dir, 'node', node_restored, options=["-j", "4"])
106103

107104
if self.paranoia:
108105
pgdata_restored = self.pgdata_content(node_restored.data_dir)
@@ -122,8 +119,8 @@ def test_backward_compatibility_delta(self):
122119
set_replication=True,
123120
initdb_params=['--data-checksums'],
124121
pg_options={
125-
'autovacuum': 'off'}
126-
)
122+
'autovacuum': 'off'})
123+
127124
self.init_pb(backup_dir, old_binary=True)
128125
self.show_pb(backup_dir)
129126

@@ -153,8 +150,7 @@ def test_backward_compatibility_delta(self):
153150
node_restored.cleanup()
154151

155152
self.restore_node(
156-
backup_dir, 'node', node_restored,
157-
options=["-j", "4", "--recovery-target-action=promote"])
153+
backup_dir, 'node', node_restored, options=["-j", "4"])
158154

159155
if self.paranoia:
160156
pgdata_restored = self.pgdata_content(node_restored.data_dir)
@@ -178,8 +174,7 @@ def test_backward_compatibility_delta(self):
178174

179175
node_restored.cleanup()
180176
self.restore_node(
181-
backup_dir, 'node', node_restored,
182-
options=["-j", "4", "--recovery-target-action=promote"])
177+
backup_dir, 'node', node_restored, options=["-j", "4"])
183178

184179
if self.paranoia:
185180
pgdata_restored = self.pgdata_content(node_restored.data_dir)
@@ -203,8 +198,7 @@ def test_backward_compatibility_delta(self):
203198
node_restored.cleanup()
204199

205200
self.restore_node(
206-
backup_dir, 'node', node_restored,
207-
options=["-j", "4", "--recovery-target-action=promote"])
201+
backup_dir, 'node', node_restored, options=["-j", "4"])
208202

209203
if self.paranoia:
210204
pgdata_restored = self.pgdata_content(node_restored.data_dir)

‎tests/delta.py‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,9 @@ def test_delta_multiple_segments(self):
465465
tblspc_path_new = self.get_tblspace_path(
466466
restored_node, 'somedata_restored')
467467

468-
self.restore_node(backup_dir, 'node', restored_node, options=[
469-
"-j", "4", "-T", "{0}={1}".format(tblspc_path, tblspc_path_new),
470-
"--recovery-target-action=promote"])
468+
self.restore_node(
469+
backup_dir, 'node', restored_node, options=[
470+
"-j", "4", "-T", "{0}={1}".format(tblspc_path, tblspc_path_new)])
471471

472472
# GET PHYSICAL CONTENT FROM NODE_RESTORED
473473
pgdata_restored = self.pgdata_content(restored_node.data_dir)
@@ -835,33 +835,31 @@ def test_alter_table_set_tablespace_delta(self):
835835
"postgres",
836836
"create table t_heap tablespace somedata as select i as id,"
837837
" md5(i::text) as text, md5(i::text)::tsvector as tsvector"
838-
" from generate_series(0,100) i"
839-
)
838+
" from generate_series(0,100) i")
839+
840840
# FULL backup
841841
self.backup_node(backup_dir, 'node', node, options=["--stream"])
842842

843843
# ALTER TABLESPACE
844844
self.create_tblspace_in_node(node, 'somedata_new')
845845
node.safe_psql(
846846
"postgres",
847-
"alter table t_heap set tablespace somedata_new"
848-
)
847+
"alter table t_heap set tablespace somedata_new")
849848

850849
# DELTA BACKUP
851850
result = node.safe_psql(
852851
"postgres", "select * from t_heap")
853852
self.backup_node(
854853
backup_dir, 'node', node,
855854
backup_type='delta',
856-
options=["--stream"]
857-
)
855+
options=["--stream"])
856+
858857
if self.paranoia:
859858
pgdata = self.pgdata_content(node.data_dir)
860859

861860
# RESTORE
862861
node_restored = self.make_simple_node(
863-
base_dir=os.path.join(module_name, fname, 'node_restored')
864-
)
862+
base_dir=os.path.join(module_name, fname, 'node_restored'))
865863
node_restored.cleanup()
866864

867865
self.restore_node(
@@ -875,8 +873,7 @@ def test_alter_table_set_tablespace_delta(self):
875873
"-T", "{0}={1}".format(
876874
self.get_tblspace_path(node, 'somedata_new'),
877875
self.get_tblspace_path(node_restored, 'somedata_new')
878-
),
879-
"--recovery-target-action=promote"
876+
)
880877
]
881878
)
882879

@@ -1275,7 +1272,7 @@ def test_delta_nullified_heap_page_backup(self):
12751272
content = f.read()
12761273

12771274
self.assertIn(
1278-
"VERBOSE: File: {0} blknum 1, empty page".format(file),
1275+
'VERBOSE: File: "{0}" blknum 1, empty page'.format(file),
12791276
content)
12801277
self.assertNotIn(
12811278
"Skipping blknum 1 in file: {0}".format(file),

‎tests/merge.py‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -642,9 +642,8 @@ def test_merge_page_truncate(self):
642642
initdb_params=['--data-checksums'],
643643
pg_options={
644644
'checkpoint_timeout': '300s',
645-
'autovacuum': 'off'
646-
}
647-
)
645+
'autovacuum': 'off'})
646+
648647
node_restored = self.make_simple_node(
649648
base_dir=os.path.join(module_name, fname, 'node_restored'))
650649

@@ -694,8 +693,7 @@ def test_merge_page_truncate(self):
694693
backup_dir, 'node', node_restored,
695694
options=[
696695
"-j", "4",
697-
"-T", "{0}={1}".format(old_tablespace, new_tablespace),
698-
"--recovery-target-action=promote"])
696+
"-T", "{0}={1}".format(old_tablespace, new_tablespace)])
699697

700698
# Physical comparison
701699
if self.paranoia:
@@ -735,9 +733,8 @@ def test_merge_delta_truncate(self):
735733
initdb_params=['--data-checksums'],
736734
pg_options={
737735
'checkpoint_timeout': '300s',
738-
'autovacuum': 'off'
739-
}
740-
)
736+
'autovacuum': 'off'})
737+
741738
node_restored = self.make_simple_node(
742739
base_dir=os.path.join(module_name, fname, 'node_restored'))
743740

@@ -787,8 +784,7 @@ def test_merge_delta_truncate(self):
787784
backup_dir, 'node', node_restored,
788785
options=[
789786
"-j", "4",
790-
"-T", "{0}={1}".format(old_tablespace, new_tablespace),
791-
"--recovery-target-action=promote"])
787+
"-T", "{0}={1}".format(old_tablespace, new_tablespace)])
792788

793789
# Physical comparison
794790
if self.paranoia:

‎tests/page.py‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ def test_basic_page_vacuum_truncate(self):
2828
initdb_params=['--data-checksums'],
2929
pg_options={
3030
'checkpoint_timeout': '300s',
31-
'autovacuum': 'off'
32-
}
33-
)
31+
'autovacuum': 'off'})
32+
3433
node_restored = self.make_simple_node(
3534
base_dir=os.path.join(module_name, fname, 'node_restored'))
3635

@@ -78,8 +77,7 @@ def test_basic_page_vacuum_truncate(self):
7877
backup_dir, 'node', node_restored,
7978
options=[
8079
"-j", "4",
81-
"-T", "{0}={1}".format(old_tablespace, new_tablespace),
82-
"--recovery-target-action=promote"])
80+
"-T", "{0}={1}".format(old_tablespace, new_tablespace)])
8381

8482
# Physical comparison
8583
if self.paranoia:
@@ -302,9 +300,7 @@ def test_page_multiple_segments(self):
302300
'shared_buffers': '1GB',
303301
'maintenance_work_mem': '1GB',
304302
'autovacuum': 'off',
305-
'full_page_writes': 'off'
306-
}
307-
)
303+
'full_page_writes': 'off'})
308304

309305
self.init_pb(backup_dir)
310306
self.add_instance(backup_dir, 'node', node)
@@ -343,7 +339,6 @@ def test_page_multiple_segments(self):
343339
backup_dir, 'node', restored_node,
344340
options=[
345341
"-j", "4",
346-
"--recovery-target-action=promote",
347342
"-T", "{0}={1}".format(tblspc_path, tblspc_path_new)])
348343

349344
# GET PHYSICAL CONTENT FROM NODE_RESTORED
@@ -958,15 +953,14 @@ def test_page_backup_with_alien_wal_segment(self):
958953
"Output: {0} \n CMD: {1}".format(
959954
self.output, self.cmd))
960955
except ProbackupException as e:
961-
self.assertTrue(
962-
'INFO: Wait for LSN' in e.message and
963-
'in archived WAL segment' in e.message and
964-
'Could not read WAL record at' in e.message and
965-
'WAL file is from different database system: WAL file database system identifier is' in e.message and
966-
'pg_control database system identifier is' in e.message and
967-
'Possible WAL corruption. Error has occured during reading WAL segment' in e.message,
968-
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
969-
repr(e.message), self.cmd))
956+
self.assertIn('INFO: Wait for WAL segment', e.message)
957+
self.assertIn('to be archived', e.message)
958+
self.assertIn('Could not read WAL record at', e.message)
959+
self.assertIn('WAL file is from different database system: '
960+
'WAL file database system identifier is', e.message)
961+
self.assertIn('pg_control database system identifier is', e.message)
962+
self.assertIn('Possible WAL corruption. Error has occured '
963+
'during reading WAL segment', e.message)
970964

971965
self.assertEqual(
972966
'ERROR',

‎tests/restore.py‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ def test_restore_full_to_latest(self):
4747
self.assertIn(
4848
"INFO: Restore of backup {0} completed.".format(backup_id),
4949
self.restore_node(
50-
backup_dir, 'node', node,
51-
options=["-j", "4", "--recovery-target-action=promote"]),
50+
backup_dir, 'node', node, options=["-j", "4"]),
5251
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
5352
repr(self.output), self.cmd))
5453

@@ -98,8 +97,7 @@ def test_restore_full_page_to_latest(self):
9897
self.assertIn(
9998
"INFO: Restore of backup {0} completed.".format(backup_id),
10099
self.restore_node(
101-
backup_dir, 'node', node,
102-
options=["-j", "4", "--recovery-target-action=promote"]),
100+
backup_dir, 'node', node, options=["-j", "4"]),
103101
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
104102
repr(self.output), self.cmd))
105103

@@ -139,8 +137,7 @@ def test_restore_to_specific_timeline(self):
139137
self.assertIn(
140138
"INFO: Restore of backup {0} completed.".format(backup_id),
141139
self.restore_node(
142-
backup_dir, 'node', node,
143-
options=["-j", "4", "--recovery-target-action=promote"]),
140+
backup_dir, 'node', node, options=["-j", "4"]),
144141
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
145142
repr(self.output), self.cmd))
146143

@@ -162,8 +159,7 @@ def test_restore_to_specific_timeline(self):
162159
self.restore_node(
163160
backup_dir, 'node', node,
164161
options=[
165-
"-j", "4", "--timeline={0}".format(target_tli),
166-
"--recovery-target-action=promote"]
162+
"-j", "4", "--timeline={0}".format(target_tli)]
167163
),
168164
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
169165
repr(self.output), self.cmd))
@@ -883,8 +879,7 @@ def test_restore_with_tablespace_mapping_1(self):
883879
self.restore_node(
884880
backup_dir, 'node', node,
885881
options=[
886-
"-T", "%s=%s" % (tblspc_path, tblspc_path_new),
887-
"--recovery-target-action=promote"]
882+
"-T", "%s=%s" % (tblspc_path, tblspc_path_new)]
888883
),
889884
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
890885
repr(self.output), self.cmd))
@@ -915,8 +910,7 @@ def test_restore_with_tablespace_mapping_1(self):
915910
self.restore_node(
916911
backup_dir, 'node', node,
917912
options=[
918-
"-T", "%s=%s" % (tblspc_path_new, tblspc_path_page),
919-
"--recovery-target-action=promote"]),
913+
"-T", "%s=%s" % (tblspc_path_new, tblspc_path_page)]),
920914
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
921915
repr(self.output), self.cmd))
922916

@@ -991,8 +985,7 @@ def test_restore_with_tablespace_mapping_2(self):
991985
self.restore_node(
992986
backup_dir, 'node', node,
993987
options=[
994-
"-T", "%s=%s" % (tblspc_path, tblspc_path_new),
995-
"--recovery-target-action=promote"]),
988+
"-T", "%s=%s" % (tblspc_path, tblspc_path_new)]),
996989
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
997990
repr(self.output), self.cmd))
998991
node.slow_start()
@@ -1804,25 +1797,23 @@ def test_restore_target_immediate_stream(self):
18041797

18051798
recovery_conf = os.path.join(node.data_dir, 'recovery.conf')
18061799

1807-
# restore page backup
1800+
# restore delta backup
18081801
node.cleanup()
18091802
self.restore_node(
18101803
backup_dir, 'node', node, options=['--immediate'])
18111804

1812-
# For stream backup with immediate recovery target there is no need to
1813-
# create recovery.conf. Is it wise?
1814-
self.assertFalse(
1815-
os.path.isfile(recovery_conf))
1805+
self.assertTrue(
1806+
os.path.isfile(recovery_conf),
1807+
"File {0} do not exists".format(recovery_conf))
18161808

1817-
# restore page backup
1809+
# restore delta backup
18181810
node.cleanup()
18191811
self.restore_node(
18201812
backup_dir, 'node', node, options=['--recovery-target=immediate'])
18211813

1822-
# For stream backup with immediate recovery target there is no need to
1823-
# create recovery.conf. Is it wise?
1824-
self.assertFalse(
1825-
os.path.isfile(recovery_conf))
1814+
self.assertTrue(
1815+
os.path.isfile(recovery_conf),
1816+
"File {0} do not exists".format(recovery_conf))
18261817

18271818
# Clean after yourself
18281819
self.del_test_dir(module_name, fname)

0 commit comments

Comments
 (0)