NotificationsYou must be signed in to change notification settings
Fork91
Star761

Commit852c993

committed

tests: improve node cleanup in "incr_restore" module

1 parentb6900aa commit852c993Copy full SHA for 852c993

File tree

1 file changed

+12

-15

lines changed

tests
- incr_restore.py

1 file changed

+12

-15

lines changed

`‎tests/incr_restore.py‎`

Lines changed: 12 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ def test_basic_incr_restore(self):`
`80`	`80`	`# Clean after yourself`
`81`	`81`	`self.del_test_dir(module_name,fname)`
`82`	`82`
`83`		`-`
`84`	`83`	`# @unittest.skip("skip")`
`85`	`84`	`deftest_checksum_corruption_detection(self):`
`86`	`85`	`"""recovery to target timeline"""`
`@@ -105,32 +104,30 @@ def test_checksum_corruption_detection(self):`
`105`	`104`	`pgbench.wait()`
`106`	`105`	`pgbench.stdout.close()`
`107`	`106`
`108`		`-self.backup_node(backup_dir,'node',node,backup_type='delta')`
	`107`	`+self.backup_node(backup_dir,'node',node,backup_type='page')`
`109`	`108`
`110`	`109`	`pgbench=node.pgbench(`
`111`	`110`	`stdout=subprocess.PIPE,stderr=subprocess.STDOUT,`
`112`	`111`	`options=['-T','10','-c','1'])`
`113`	`112`	`pgbench.wait()`
`114`	`113`	`pgbench.stdout.close()`
`115`	`114`
`116`		`-self.backup_node(backup_dir,'node',node,backup_type='delta')`
	`115`	`+self.backup_node(backup_dir,'node',node,backup_type='page')`
`117`	`116`
`118`	`117`	`pgbench=node.pgbench(`
`119`	`118`	`stdout=subprocess.PIPE,stderr=subprocess.STDOUT,`
`120`	`119`	`options=['-T','10','-c','1','--no-vacuum'])`
`121`	`120`	`pgbench.wait()`
`122`	`121`	`pgbench.stdout.close()`
`123`	`122`
`124`		`-backup_id=self.backup_node(backup_dir,'node',node,backup_type='delta')`
	`123`	`+backup_id=self.backup_node(backup_dir,'node',node,backup_type='page')`
`125`	`124`
`126`	`125`	`pgdata=self.pgdata_content(node.data_dir)`
`127`	`126`
`128`	`127`	`node.stop()`
`129`	`128`
`130`		`-# corrupt block`
`131`		`-`
`132`	`129`	`self.restore_node(`
`133`		`-backup_dir,'node',node,options=["-j","4","--incremental-mode=checksum"])`
	`130`	`+backup_dir,'node',node,options=["-j","4","--incremental-mode=lsn"])`
`134`	`131`
`135`	`132`	`pgdata_restored=self.pgdata_content(node.data_dir)`
`136`	`133`	`self.compare_pgdata(pgdata,pgdata_restored)`
`@@ -349,7 +346,7 @@ def test_basic_incr_restore_sanity(self):`
`349`	`346`	`repr(e.message),self.cmd))`
`350`	`347`
`351`	`348`	`# Clean after yourself`
`352`		`-self.del_test_dir(module_name,fname)`
	`349`	`+self.del_test_dir(module_name,fname, [node])`
`353`	`350`
`354`	`351`	`# @unittest.skip("skip")`
`355`	`352`	`deftest_incr_checksum_restore(self):`
`@@ -438,7 +435,7 @@ def test_incr_checksum_restore(self):`
`438`	`435`	`self.compare_pgdata(pgdata,pgdata_restored)`
`439`	`436`
`440`	`437`	`# Clean after yourself`
`441`		`-self.del_test_dir(module_name,fname)`
	`438`	`+self.del_test_dir(module_name,fname, [node,node_1])`
`442`	`439`
`443`	`440`
`444`	`441`	`# @unittest.skip("skip")`
`@@ -527,7 +524,7 @@ def test_incr_lsn_restore(self):`
`527`	`524`	`self.compare_pgdata(pgdata,pgdata_restored)`
`528`	`525`
`529`	`526`	`# Clean after yourself`
`530`		`-self.del_test_dir(module_name,fname)`
	`527`	`+self.del_test_dir(module_name,fname, [node,node_1])`
`531`	`528`
`532`	`529`	`# @unittest.skip("skip")`
`533`	`530`	`deftest_incr_lsn_sanity(self):`
`@@ -596,7 +593,7 @@ def test_incr_lsn_sanity(self):`
`596`	`593`	`repr(e.message),self.cmd))`
`597`	`594`
`598`	`595`	`# Clean after yourself`
`599`		`-self.del_test_dir(module_name,fname)`
	`596`	`+self.del_test_dir(module_name,fname, [node_1])`
`600`	`597`
`601`	`598`	`# @unittest.skip("skip")`
`602`	`599`	`deftest_incr_checksum_sanity(self):`
`@@ -655,7 +652,7 @@ def test_incr_checksum_sanity(self):`
`655`	`652`	`self.compare_pgdata(pgdata,pgdata_restored)`
`656`	`653`
`657`	`654`	`# Clean after yourself`
`658`		`-self.del_test_dir(module_name,fname)`
	`655`	`+self.del_test_dir(module_name,fname, [node_1])`
`659`	`656`
`660`	`657`
`661`	`658`	`# @unittest.skip("skip")`
`@@ -1178,7 +1175,7 @@ def test_make_replica_via_incr_checksum_restore(self):`
`1178`	`1175`	`pgbench.wait()`
`1179`	`1176`
`1180`	`1177`	`# Clean after yourself`
`1181`		`-self.del_test_dir(module_name,fname)`
	`1178`	`+self.del_test_dir(module_name,fname, [new_master,old_master])`
`1182`	`1179`
`1183`	`1180`	`# @unittest.skip("skip")`
`1184`	`1181`	`deftest_make_replica_via_incr_lsn_restore(self):`
`@@ -1251,7 +1248,7 @@ def test_make_replica_via_incr_lsn_restore(self):`
`1251`	`1248`	`pgbench.wait()`
`1252`	`1249`
`1253`	`1250`	`# Clean after yourself`
`1254`		`-self.del_test_dir(module_name,fname)`
	`1251`	`+self.del_test_dir(module_name,fname, [new_master,old_master])`
`1255`	`1252`
`1256`	`1253`	`# @unittest.skip("skip")`
`1257`	`1254`	`# @unittest.expectedFailure`
`@@ -1492,7 +1489,7 @@ def test_incr_lsn_long_xact_2(self):`
`1492`	`1489`	`'1')`
`1493`	`1490`
`1494`	`1491`	`# Clean after yourself`
`1495`		`-self.del_test_dir(module_name,fname)`
	`1492`	`+self.del_test_dir(module_name,fname, [node])`
`1496`	`1493`
`1497`	`1494`	`# @unittest.skip("skip")`
`1498`	`1495`	`# @unittest.expectedFailure`

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!

Commit852c993

File tree

1 file changed

1 file changed

`‎tests/incr_restore.py‎`

0 commit comments