Skip to content

Commit 6dc2eaf

Browse files
gsmolkgsmolk
committed
[Issue #155] tests fixes
1 parent 2b23095 commit 6dc2eaf

File tree

3 files changed

+102
-31
lines changed

3 files changed

+102
-31
lines changed

‎tests/archive.py‎

Lines changed: 78 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,10 +1413,18 @@ def test_archive_catalog(self):
14131413
self.assertEqual(timeline_1['status'], "OK")
14141414

14151415
self.assertEqual(len(timeline_3['lost-segments']), 2)
1416-
self.assertEqual(timeline_3['lost-segments'][0]['begin-segno'], '0000000000000012')
1417-
self.assertEqual(timeline_3['lost-segments'][0]['end-segno'], '0000000000000013')
1418-
self.assertEqual(timeline_3['lost-segments'][1]['begin-segno'], '0000000000000017')
1419-
self.assertEqual(timeline_3['lost-segments'][1]['end-segno'], '0000000000000017')
1416+
self.assertEqual(
1417+
timeline_3['lost-segments'][0]['begin-segno'],
1418+
'000000030000000000000012')
1419+
self.assertEqual(
1420+
timeline_3['lost-segments'][0]['end-segno'],
1421+
'000000030000000000000013')
1422+
self.assertEqual(
1423+
timeline_3['lost-segments'][1]['begin-segno'],
1424+
'000000030000000000000017')
1425+
self.assertEqual(
1426+
timeline_3['lost-segments'][1]['end-segno'],
1427+
'000000030000000000000017')
14201428

14211429
self.assertEqual(len(timeline_6['backups']), 0)
14221430
self.assertEqual(len(timeline_5['backups']), 0)
@@ -1487,7 +1495,9 @@ def test_archive_catalog_1(self):
14871495

14881496
# sanity
14891497
for timeline in timelines:
1490-
self.assertEqual(timeline['min-segno'], '0000000000000001')
1498+
self.assertEqual(
1499+
timeline['min-segno'],
1500+
'000000010000000000000001')
14911501
self.assertEqual(timeline['status'], 'OK')
14921502

14931503
self.del_test_dir(module_name, fname)
@@ -1539,7 +1549,9 @@ def test_archive_catalog_2(self):
15391549

15401550
# sanity
15411551
for timeline in timelines:
1542-
self.assertEqual(timeline['min-segno'], '0000000000000002')
1552+
self.assertEqual(
1553+
timeline['min-segno'],
1554+
'000000010000000000000002')
15431555
self.assertEqual(timeline['status'], 'OK')
15441556

15451557
self.del_test_dir(module_name, fname)
@@ -1690,8 +1702,67 @@ def test_archive_options_1(self):
16901702

16911703
self.del_test_dir(module_name, fname)
16921704

1705+
# @unittest.skip("skip")
1706+
# @unittest.expectedFailure
1707+
def test_hexadecimal_timeline(self):
1708+
"""
1709+
Check that timelines are correct.
1710+
"""
1711+
fname = self.id().split('.')[3]
1712+
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
1713+
node = self.make_simple_node(
1714+
base_dir=os.path.join(module_name, fname, 'node'),
1715+
set_replication=True,
1716+
initdb_params=['--data-checksums'],
1717+
pg_options={'autovacuum': 'off'})
1718+
1719+
self.init_pb(backup_dir)
1720+
self.add_instance(backup_dir, 'node', node)
1721+
self.set_archiving(backup_dir, 'node', node)
1722+
node.slow_start()
1723+
1724+
backup_id = self.backup_node(backup_dir, 'node', node)
1725+
node.pgbench_init(scale=2)
1726+
1727+
# create timelines
1728+
for i in range(1, 13):
1729+
# print(i)
1730+
node.cleanup()
1731+
self.restore_node(
1732+
backup_dir, 'node', node,
1733+
options=['--recovery-target-timeline={0}'.format(i)])
1734+
node.slow_start()
1735+
node.pgbench_init(scale=2)
1736+
1737+
show = self.show_archive(backup_dir)
1738+
1739+
timelines = show[0]['timelines']
1740+
1741+
print(timelines[0])
1742+
1743+
tli13 = timelines[0]
1744+
1745+
self.assertEqual(
1746+
13,
1747+
tli13['tli'])
1748+
1749+
self.assertEqual(
1750+
12,
1751+
tli13['parent-tli'])
1752+
1753+
self.assertEqual(
1754+
backup_id,
1755+
tli13['closest-backup-id'])
1756+
1757+
self.assertEqual(
1758+
'0000000D000000000000001B',
1759+
tli13['max-segno'])
1760+
1761+
# Clean after yourself
1762+
self.del_test_dir(module_name, fname)
1763+
16931764
# important - switchpoint may be NullOffset LSN and not actually existing in archive to boot.
1694-
# so write validation code accordingly
1765+
# so write WAL validation code accordingly
16951766

16961767
# change wal-seg-size
16971768
#

‎tests/delete.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -766,8 +766,8 @@ def test_delete_multiple_descendants_dry_run(self):
766766
output)
767767

768768
self.assertIn(
769-
'On timeline 1 WAL segments between 0000000000000001 '
770-
'and 0000000000000003 can be removed',
769+
'On timeline 1 WAL segments between 000000010000000000000001 '
770+
'and 000000010000000000000003 can be removed',
771771
output)
772772

773773
self.assertEqual(len(self.show_pb(backup_dir, 'node')), 4)
@@ -791,8 +791,8 @@ def test_delete_multiple_descendants_dry_run(self):
791791
output)
792792

793793
self.assertIn(
794-
'On timeline 1 WAL segments between 0000000000000001 '
795-
'and 0000000000000003 will be removed',
794+
'On timeline 1 WAL segments between 000000010000000000000001 '
795+
'and 000000010000000000000003 will be removed',
796796
output)
797797

798798
self.assertEqual(len(self.show_pb(backup_dir, 'node')), 1)

‎tests/retention.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ def test_retention_redundancy_1(self):
6363
if not wal_name.endswith(".backup"):
6464

6565
if self.archive_compress:
66-
wal_name = wal_name[-19:]
66+
wal_name = wal_name[-27:]
6767
wal_name = wal_name[:-3]
6868
else:
69-
wal_name = wal_name[-16:]
69+
wal_name = wal_name[-24:]
7070

7171
self.assertTrue(wal_name >= min_wal)
7272
self.assertTrue(wal_name <= max_wal)
@@ -2234,8 +2234,8 @@ def test_wal_purge(self):
22342234
'--log-level-console=verbose'])
22352235

22362236
self.assertIn(
2237-
'INFO: On timeline 4 WAL segments between 0000000000000002 '
2238-
'and 0000000000000006 can be removed',
2237+
'INFO: On timeline 4 WAL segments between 000000040000000000000002 '
2238+
'and 000000040000000000000006 can be removed',
22392239
output)
22402240

22412241
self.assertIn(
@@ -2259,8 +2259,8 @@ def test_wal_purge(self):
22592259
options=['--delete-wal', '--log-level-console=verbose'])
22602260

22612261
self.assertIn(
2262-
'INFO: On timeline 4 WAL segments between 0000000000000002 '
2263-
'and 0000000000000006 will be removed',
2262+
'INFO: On timeline 4 WAL segments between 000000040000000000000002 '
2263+
'and 000000040000000000000006 will be removed',
22642264
output)
22652265

22662266
self.assertIn(
@@ -2281,11 +2281,11 @@ def test_wal_purge(self):
22812281

22822282
self.assertEqual(
22832283
show_tli4_before['min-segno'],
2284-
'0000000000000002')
2284+
'000000040000000000000002')
22852285

22862286
self.assertEqual(
22872287
show_tli4_after['min-segno'],
2288-
'0000000000000006')
2288+
'000000040000000000000006')
22892289

22902290
self.assertFalse(show_tli5_after)
22912291

@@ -2461,8 +2461,8 @@ def test_wal_depth_2(self):
24612461

24622462
self.assertIn(
24632463
'LOG: Archive backup {0} to stay consistent protect from '
2464-
'purge WAL interval between 0000000000000004 and 0000000000000004 '
2465-
'on timeline 1'.format(B1), output)
2464+
'purge WAL interval between 000000010000000000000004 '
2465+
'and 000000010000000000000004 on timeline 1'.format(B1), output)
24662466

24672467
start_lsn_B4 = self.show_pb(backup_dir, 'node', B4)['start-lsn']
24682468
self.assertIn(
@@ -2471,13 +2471,13 @@ def test_wal_depth_2(self):
24712471

24722472
self.assertIn(
24732473
'LOG: Timeline 3 to stay reachable from timeline 1 protect '
2474-
'from purge WAL interval between 0000000000000005 and '
2475-
'0000000000000008 on timeline 2', output)
2474+
'from purge WAL interval between 000000020000000000000005 and '
2475+
'000000020000000000000008 on timeline 2', output)
24762476

24772477
self.assertIn(
24782478
'LOG: Timeline 3 to stay reachable from timeline 1 protect '
2479-
'from purge WAL interval between 0000000000000004 and '
2480-
'0000000000000005 on timeline 1', output)
2479+
'from purge WAL interval between 000000010000000000000004 and '
2480+
'000000010000000000000005 on timeline 1', output)
24812481

24822482
show_tli1_before = self.show_archive(backup_dir, 'node', tli=1)
24832483
show_tli2_before = self.show_archive(backup_dir, 'node', tli=2)
@@ -2509,11 +2509,11 @@ def test_wal_depth_2(self):
25092509

25102510
self.assertEqual(
25112511
show_tli4_before['min-segno'],
2512-
'0000000000000002')
2512+
'000000040000000000000002')
25132513

25142514
self.assertEqual(
25152515
show_tli4_after['min-segno'],
2516-
'0000000000000006')
2516+
'000000040000000000000006')
25172517

25182518
self.assertFalse(show_tli5_after)
25192519

@@ -2528,19 +2528,19 @@ def test_wal_depth_2(self):
25282528

25292529
self.assertEqual(
25302530
show_tli1_after['lost-segments'][0]['begin-segno'],
2531-
'0000000000000006')
2531+
'000000010000000000000006')
25322532

25332533
self.assertEqual(
25342534
show_tli1_after['lost-segments'][0]['end-segno'],
2535-
'0000000000000009')
2535+
'000000010000000000000009')
25362536

25372537
self.assertEqual(
25382538
show_tli2_after['lost-segments'][0]['begin-segno'],
2539-
'0000000000000009')
2539+
'000000020000000000000009')
25402540

25412541
self.assertEqual(
25422542
show_tli2_after['lost-segments'][0]['end-segno'],
2543-
'0000000000000009')
2543+
'000000020000000000000009')
25442544

25452545
self.validate_pb(backup_dir, 'node')
25462546

0 commit comments

Comments
 (0)