NotificationsYou must be signed in to change notification settings
Fork91
Star761

Commita23386e

committed

tests: fix test_validate_nullified_heap_page_backup and test_delta_nullified_heap_page_backup

1 parent46da0d8 commita23386eCopy full SHA for a23386e

File tree

2 files changed

+26

-18

lines changed

tests
- delta.py
- validate_test.py

2 files changed

+26

-18

lines changed

`‎tests/delta.py‎`

Lines changed: 11 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -1254,9 +1254,8 @@ def test_delta_nullified_heap_page_backup(self):`
`1254`	`1254`	`fname=self.id().split('.')[3]`
`1255`	`1255`	`node=self.make_simple_node(`
`1256`	`1256`	`base_dir=os.path.join(module_name,fname,'node'),`
`1257`		`-initdb_params=['--data-checksums'],`
`1258`		`-pg_options={'wal_level':'replica'}`
`1259`		`- )`
	`1257`	`+initdb_params=['--data-checksums'])`
	`1258`	`+`
`1260`	`1259`	`backup_dir=os.path.join(self.tmp_path,module_name,fname,'backup')`
`1261`	`1260`	`self.init_pb(backup_dir)`
`1262`	`1261`	`self.add_instance(backup_dir,'node',node)`
`@@ -1292,22 +1291,21 @@ def test_delta_nullified_heap_page_backup(self):`
`1292`	`1291`	`ifself.paranoia:`
`1293`	`1292`	`pgdata=self.pgdata_content(node.data_dir)`
`1294`	`1293`
`1295`		`-log_file_path=os.path.join(backup_dir,"log","pg_probackup.log")`
`1296`		`-withopen(log_file_path)asf:`
`1297`		`-self.assertTrue("LOG: File: {0} blknum 1, empty page".format(`
`1298`		`-file)inf.read())`
`1299`		`-self.assertFalse("Skipping blknum: 1 in file: {0}".format(`
`1300`		`-file)inf.read())`
	`1294`	`+ifnotself.remote:`
	`1295`	`+log_file_path=os.path.join(backup_dir,"log","pg_probackup.log")`
	`1296`	`+withopen(log_file_path)asf:`
	`1297`	`+self.assertTrue("LOG: File: {0} blknum 1, empty page".format(`
	`1298`	`+file)inf.read())`
	`1299`	`+self.assertFalse("Skipping blknum: 1 in file: {0}".format(`
	`1300`	`+file)inf.read())`
`1301`	`1301`
`1302`	`1302`	`# Restore DELTA backup`
`1303`	`1303`	`node_restored=self.make_simple_node(`
`1304`		`-base_dir=os.path.join(module_name,fname,'node_restored'),`
`1305`		`- )`
	`1304`	`+base_dir=os.path.join(module_name,fname,'node_restored'))`
`1306`	`1305`	`node_restored.cleanup()`
`1307`	`1306`
`1308`	`1307`	`self.restore_node(`
`1309`		`-backup_dir,'node',node_restored`
`1310`		`- )`
	`1308`	`+backup_dir,'node',node_restored)`
`1311`	`1309`
`1312`	`1310`	`ifself.paranoia:`
`1313`	`1311`	`pgdata_restored=self.pgdata_content(node_restored.data_dir)`

`‎tests/validate_test.py‎`

Lines changed: 15 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,14 +51,24 @@ def test_validate_nullified_heap_page_backup(self):`
`51`	`51`	`self.backup_node(`
`52`	`52`	`backup_dir,'node',node,options=['--log-level-file=verbose'])`
`53`	`53`
`54`		`-log_file_path=os.path.join(backup_dir,"log","pg_probackup.log")`
	`54`	`+ifself.paranoia:`
	`55`	`+pgdata=self.pgdata_content(node.data_dir)`
`55`	`56`
`56`		`-withopen(log_file_path)asf:`
`57`		`-self.assertTrue(`
`58`		`-'{0} blknum 1, empty page'.format(file_path)inf.read(),`
`59`		`-'Failed to detect nullified block')`
	`57`	`+ifnotself.remote:`
	`58`	`+log_file_path=os.path.join(backup_dir,"log","pg_probackup.log")`
	`59`	`+withopen(log_file_path)asf:`
	`60`	`+self.assertTrue(`
	`61`	`+'{0} blknum 1, empty page'.format(file_path)inf.read(),`
	`62`	`+'Failed to detect nullified block')`
`60`	`63`
`61`	`64`	`self.validate_pb(backup_dir)`
	`65`	`+node.cleanup()`
	`66`	`+`
	`67`	`+self.restore_node(backup_dir,'node',node)`
	`68`	`+`
	`69`	`+ifself.paranoia:`
	`70`	`+pgdata_restored=self.pgdata_content(node.data_dir)`
	`71`	`+self.compare_pgdata(pgdata,pgdata_restored)`
`62`	`72`
`63`	`73`	`# Clean after yourself`
`64`	`74`	`self.del_test_dir(module_name,fname)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita23386e

File tree

2 files changed

2 files changed

`‎tests/delta.py‎`

`‎tests/validate_test.py‎`

0 commit comments