Skip to content

Commit 53be624

Browse files
gsmolkgsmolk
committed
tests: remove debug messages in module "incr_restore"
1 parent 0fbf1a2 commit 53be624

File tree

1 file changed

+53
-46
lines changed

1 file changed

+53
-46
lines changed

‎tests/incr_restore.py‎

Lines changed: 53 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ def test_basic_incr_restore(self):
7070

7171
node.stop()
7272

73-
print(self.restore_node(
73+
self.restore_node(
7474
backup_dir, 'node', node,
75-
options=["-j", "4", "--incremental-mode=checksum"]))
75+
options=["-j", "4", "--incremental-mode=checksum"])
7676

7777
pgdata_restored = self.pgdata_content(node.data_dir)
7878
self.compare_pgdata(pgdata, pgdata_restored)
@@ -119,9 +119,9 @@ def test_basic_incr_restore_into_missing_directory(self):
119119

120120
node.cleanup()
121121

122-
print(self.restore_node(
122+
self.restore_node(
123123
backup_dir, 'node', node,
124-
options=["-j", "4", "--incremental-mode=checksum"]))
124+
options=["-j", "4", "--incremental-mode=checksum"])
125125

126126
pgdata_restored = self.pgdata_content(node.data_dir)
127127
self.compare_pgdata(pgdata, pgdata_restored)
@@ -453,7 +453,6 @@ def test_incr_restore_with_tablespace_4(self):
453453
"Output: {0} \n CMD: {1}".format(
454454
repr(self.output), self.cmd))
455455
except ProbackupException as e:
456-
print(e.message)
457456
self.assertIn(
458457
'WARNING: Backup catalog was initialized for system id',
459458
e.message,
@@ -649,8 +648,6 @@ def test_incr_restore_with_tablespace_7(self):
649648
options=[
650649
"-j", "4", "--incremental-mode=checksum"])
651650

652-
print(out)
653-
654651
pgdata_restored = self.pgdata_content(node.data_dir)
655652
self.compare_pgdata(pgdata, pgdata_restored)
656653

@@ -800,9 +797,9 @@ def test_incr_checksum_restore(self):
800797

801798
pgdata = self.pgdata_content(node_1.data_dir)
802799

803-
print(self.restore_node(
800+
self.restore_node(
804801
backup_dir, 'node', node,
805-
options=["-j", "4", "--incremental-mode=checksum"]))
802+
options=["-j", "4", "--incremental-mode=checksum"])
806803

807804
pgdata_restored = self.pgdata_content(node.data_dir)
808805

@@ -890,8 +887,8 @@ def test_incr_lsn_restore(self):
890887

891888
pgdata = self.pgdata_content(node_1.data_dir)
892889

893-
print(self.restore_node(
894-
backup_dir, 'node', node, options=["-j", "4", "--incremental-mode=lsn"]))
890+
self.restore_node(
891+
backup_dir, 'node', node, options=["-j", "4", "--incremental-mode=lsn"])
895892

896893
pgdata_restored = self.pgdata_content(node.data_dir)
897894

@@ -1079,9 +1076,9 @@ def test_incr_checksum_corruption_detection(self):
10791076
f.flush()
10801077
f.close
10811078

1082-
print(self.restore_node(
1079+
self.restore_node(
10831080
backup_dir, 'node', node, data_dir=node.data_dir,
1084-
options=["-j", "4", "--incremental-mode=checksum"]))
1081+
options=["-j", "4", "--incremental-mode=checksum"])
10851082

10861083
pgdata_restored = self.pgdata_content(node.data_dir)
10871084

@@ -1209,9 +1206,9 @@ def test_incr_restore_multiple_external(self):
12091206

12101207
node.stop()
12111208

1212-
print(self.restore_node(
1209+
self.restore_node(
12131210
backup_dir, 'node', node,
1214-
options=["-j", "4", '--incremental-mode=checksum', '--log-level-console=VERBOSE']))
1211+
options=["-j", "4", '--incremental-mode=checksum'])
12151212

12161213
pgdata_restored = self.pgdata_content(
12171214
node.base_dir, exclude_dirs=['logs'])
@@ -1281,9 +1278,9 @@ def test_incr_lsn_restore_multiple_external(self):
12811278

12821279
node.stop()
12831280

1284-
print(self.restore_node(
1281+
self.restore_node(
12851282
backup_dir, 'node', node,
1286-
options=["-j", "4", '--incremental-mode=lsn']))
1283+
options=["-j", "4", '--incremental-mode=lsn'])
12871284

12881285
pgdata_restored = self.pgdata_content(
12891286
node.base_dir, exclude_dirs=['logs'])
@@ -1341,11 +1338,13 @@ def test_incr_lsn_restore_backward(self):
13411338

13421339
node.stop()
13431340

1344-
print(self.restore_node(
1341+
self.restore_node(
13451342
backup_dir, 'node', node, backup_id=full_id,
13461343
options=[
1347-
"-j", "4", '--incremental-mode=lsn', '--log-level-file=VERBOSE',
1348-
'--recovery-target=immediate', '--recovery-target-action=pause']))
1344+
"-j", "4",
1345+
'--incremental-mode=lsn',
1346+
'--recovery-target=immediate',
1347+
'--recovery-target-action=pause'])
13491348

13501349
pgdata_restored = self.pgdata_content(node.data_dir)
13511350
self.compare_pgdata(full_pgdata, pgdata_restored)
@@ -1384,11 +1383,13 @@ def test_incr_lsn_restore_backward(self):
13841383
node.slow_start(replica=True)
13851384
node.stop()
13861385

1387-
print(self.restore_node(
1386+
self.restore_node(
13881387
backup_dir, 'node', node, backup_id=delta_id,
13891388
options=[
1390-
"-j", "4", '--incremental-mode=lsn',
1391-
'--recovery-target=immediate', '--recovery-target-action=pause']))
1389+
"-j", "4",
1390+
'--incremental-mode=lsn',
1391+
'--recovery-target=immediate',
1392+
'--recovery-target-action=pause'])
13921393

13931394
pgdata_restored = self.pgdata_content(node.data_dir)
13941395
self.compare_pgdata(delta_pgdata, pgdata_restored)
@@ -1447,35 +1448,41 @@ def test_incr_checksum_restore_backward(self):
14471448

14481449
node.stop()
14491450

1450-
print(self.restore_node(
1451+
self.restore_node(
14511452
backup_dir, 'node', node, backup_id=full_id,
14521453
options=[
1453-
"-j", "4", '--incremental-mode=checksum',
1454-
'--recovery-target=immediate', '--recovery-target-action=pause']))
1454+
"-j", "4",
1455+
'--incremental-mode=checksum',
1456+
'--recovery-target=immediate',
1457+
'--recovery-target-action=pause'])
14551458

14561459
pgdata_restored = self.pgdata_content(node.data_dir)
14571460
self.compare_pgdata(full_pgdata, pgdata_restored)
14581461

14591462
node.slow_start(replica=True)
14601463
node.stop()
14611464

1462-
print(self.restore_node(
1465+
self.restore_node(
14631466
backup_dir, 'node', node, backup_id=page_id,
14641467
options=[
1465-
"-j", "4", '--incremental-mode=checksum',
1466-
'--recovery-target=immediate', '--recovery-target-action=pause']))
1468+
"-j", "4",
1469+
'--incremental-mode=checksum',
1470+
'--recovery-target=immediate',
1471+
'--recovery-target-action=pause'])
14671472

14681473
pgdata_restored = self.pgdata_content(node.data_dir)
14691474
self.compare_pgdata(page_pgdata, pgdata_restored)
14701475

14711476
node.slow_start(replica=True)
14721477
node.stop()
14731478

1474-
print(self.restore_node(
1479+
self.restore_node(
14751480
backup_dir, 'node', node, backup_id=delta_id,
14761481
options=[
1477-
"-j", "4", '--incremental-mode=checksum',
1478-
'--recovery-target=immediate', '--recovery-target-action=pause']))
1482+
"-j", "4",
1483+
'--incremental-mode=checksum',
1484+
'--recovery-target=immediate',
1485+
'--recovery-target-action=pause'])
14791486

14801487
pgdata_restored = self.pgdata_content(node.data_dir)
14811488
self.compare_pgdata(delta_pgdata, pgdata_restored)
@@ -1542,9 +1549,9 @@ def test_make_replica_via_incr_checksum_restore(self):
15421549
data_dir=new_master.data_dir, backup_type='page')
15431550

15441551
# restore old master as replica
1545-
print(self.restore_node(
1552+
self.restore_node(
15461553
backup_dir, 'node', old_master, data_dir=old_master.data_dir,
1547-
options=['-R', '--incremental-mode=checksum']))
1554+
options=['-R', '--incremental-mode=checksum'])
15481555

15491556
self.set_replica(new_master, old_master, synchronous=True)
15501557

@@ -1615,9 +1622,9 @@ def test_make_replica_via_incr_lsn_restore(self):
16151622
data_dir=new_master.data_dir, backup_type='page')
16161623

16171624
# restore old master as replica
1618-
print(self.restore_node(
1625+
self.restore_node(
16191626
backup_dir, 'node', old_master, data_dir=old_master.data_dir,
1620-
options=['-R', '--incremental-mode=lsn']))
1627+
options=['-R', '--incremental-mode=lsn'])
16211628

16221629
self.set_replica(new_master, old_master, synchronous=True)
16231630

@@ -1762,9 +1769,9 @@ def test_incr_lsn_long_xact_1(self):
17621769
node.stop()
17631770

17641771
try:
1765-
print(self.restore_node(
1772+
self.restore_node(
17661773
backup_dir, 'node', node, backup_id=full_id,
1767-
options=["-j", "4", '--incremental-mode=lsn']))
1774+
options=["-j", "4", '--incremental-mode=lsn'])
17681775
# we should die here because exception is what we expect to happen
17691776
self.assertEqual(
17701777
1, 0,
@@ -1920,9 +1927,9 @@ def test_incr_restore_zero_size_file_checksum(self):
19201927

19211928
node.stop()
19221929

1923-
print(self.restore_node(
1930+
self.restore_node(
19241931
backup_dir, 'node', node, backup_id=id1,
1925-
options=["-j", "4", '-I', 'checksum']))
1932+
options=["-j", "4", '-I', 'checksum'])
19261933

19271934
pgdata_restored = self.pgdata_content(node.data_dir)
19281935
self.compare_pgdata(pgdata1, pgdata_restored)
@@ -1994,9 +2001,9 @@ def test_incr_restore_zero_size_file_lsn(self):
19942001

19952002
node.stop()
19962003

1997-
print(self.restore_node(
2004+
self.restore_node(
19982005
backup_dir, 'node', node, backup_id=id1,
1999-
options=["-j", "4", '-I', 'checksum']))
2006+
options=["-j", "4", '-I', 'checksum'])
20002007

20012008
pgdata_restored = self.pgdata_content(node.data_dir)
20022009
self.compare_pgdata(pgdata1, pgdata_restored)
@@ -2088,12 +2095,12 @@ def test_incremental_partial_restore_exclude_checksum(self):
20882095
pgdata1 = self.pgdata_content(node1.data_dir)
20892096

20902097
# partial incremental restore backup into node2
2091-
print(self.restore_node(
2098+
self.restore_node(
20922099
backup_dir, 'node',
20932100
node2, options=[
20942101
"--db-exclude=db1",
20952102
"--db-exclude=db5",
2096-
"-I", "checksum"]))
2103+
"-I", "checksum"])
20972104

20982105
pgdata2 = self.pgdata_content(node2.data_dir)
20992106

@@ -2198,12 +2205,12 @@ def test_incremental_partial_restore_exclude_lsn(self):
21982205
node2.port = node.port
21992206
node2.slow_start()
22002207
node2.stop()
2201-
print(self.restore_node(
2208+
self.restore_node(
22022209
backup_dir, 'node',
22032210
node2, options=[
22042211
"--db-exclude=db1",
22052212
"--db-exclude=db5",
2206-
"-I", "lsn"]))
2213+
"-I", "lsn"])
22072214

22082215
pgdata2 = self.pgdata_content(node2.data_dir)
22092216

0 commit comments

Comments
 (0)