NotificationsYou must be signed in to change notification settings
Fork91
Star761

Commit16dca32

committed

tests minor cleanup

1 parent1e1daa0 commit16dca32Copy full SHA for 16dca32

File tree

2 files changed

-22

lines changed

tests
- external.py
- restore.py

2 files changed

-22

lines changed

`‎tests/external.py‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ def test_external_none(self):`
`128`	`128`	`self.backup_node(`
`129`	`129`	`backup_dir,'node',node,`
`130`	`130`	`options=[`
	`131`	`+'--stream',`
`131`	`132`	`'--external-dirs={0}'.format(external_dir)])`
`132`	`133`
`133`	`134`	`# Delta backup without external directory`

`‎tests/restore.py‎`

Lines changed: 6 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -1344,10 +1344,6 @@ def test_zags_block_corrupt_1(self):`
`1344`	`1344`	`'postgres',`
`1345`	`1345`	`'insert into tbl select i from generate_series(0,100000) as i')`
`1346`	`1346`
`1347`		`-print(node.safe_psql(`
`1348`		`-'postgres',`
`1349`		`-"select pg_relation_size('idx')"))`
`1350`		`-`
`1351`	`1347`	`node.safe_psql(`
`1352`	`1348`	`'postgres',`
`1353`	`1349`	`'delete from tbl where i%2 = 0')`
`@@ -1364,10 +1360,6 @@ def test_zags_block_corrupt_1(self):`
`1364`	`1360`	`'postgres',`
`1365`	`1361`	`'create extension pageinspect')`
`1366`	`1362`
`1367`		`-print(node.safe_psql(`
`1368`		`-'postgres',`
`1369`		`-"select * from bt_page_stats('idx',1)"))`
`1370`		`-`
`1371`	`1363`	`node.safe_psql(`
`1372`	`1364`	`'postgres',`
`1373`	`1365`	`'checkpoint')`
`@@ -1413,8 +1405,8 @@ def test_zags_block_corrupt_1(self):`
`1413`	`1405`	`if'selected new timeline ID'inf.read():`
`1414`	`1406`	`break`
`1415`	`1407`
`1416`		`-withopen(node_restored.pg_log_file,'r')asf:`
`1417`		`-print(f.read())`
	`1408`	`+#with open(node_restored.pg_log_file, 'r') as f:`
	`1409`	`+# print(f.read())`
`1418`	`1410`
`1419`	`1411`	`pgdata_restored=self.pgdata_content(node_restored.data_dir)`
`1420`	`1412`
`@@ -1905,8 +1897,8 @@ def test_restore_target_latest_archive(self):`
`1905`	`1897`	`self.restore_node(`
`1906`	`1898`	`backup_dir,'node',node)`
`1907`	`1899`
`1908`		`-withopen(recovery_conf,'r')asf:`
`1909`		`-print(f.read())`
	`1900`	`+#with open(recovery_conf, 'r') as f:`
	`1901`	`+# print(f.read())`
`1910`	`1902`
`1911`	`1903`	`hash_1=hashlib.md5(`
`1912`	`1904`	`open(recovery_conf,'rb').read()).hexdigest()`
`@@ -1916,8 +1908,8 @@ def test_restore_target_latest_archive(self):`
`1916`	`1908`	`self.restore_node(`
`1917`	`1909`	`backup_dir,'node',node,options=['--recovery-target=latest'])`
`1918`	`1910`
`1919`		`-withopen(recovery_conf,'r')asf:`
`1920`		`-print(f.read())`
	`1911`	`+#with open(recovery_conf, 'r') as f:`
	`1912`	`+# print(f.read())`
`1921`	`1913`
`1922`	`1914`	`hash_2=hashlib.md5(`
`1923`	`1915`	`open(recovery_conf,'rb').read()).hexdigest()`
`@@ -1999,8 +1991,6 @@ def test_restore_target_new_options(self):`
`1999`	`1991`	`withopen(recovery_conf,'r')asf:`
`2000`	`1992`	`recovery_conf_content=f.read()`
`2001`	`1993`
`2002`		`-print(recovery_conf_content)`
`2003`		`-`
`2004`	`1994`	`self.assertIn(`
`2005`	`1995`	`"recovery_target_time = '{0}'".format(target_time),`
`2006`	`1996`	`recovery_conf_content)`
`@@ -2028,8 +2018,6 @@ def test_restore_target_new_options(self):`
`2028`	`2018`	`withopen(recovery_conf,'r')asf:`
`2029`	`2019`	`recovery_conf_content=f.read()`
`2030`	`2020`
`2031`		`-print(recovery_conf_content)`
`2032`		`-`
`2033`	`2021`	`self.assertIn(`
`2034`	`2022`	`"recovery_target_xid = '{0}'".format(target_xid),`
`2035`	`2023`	`recovery_conf_content)`
`@@ -2057,8 +2045,6 @@ def test_restore_target_new_options(self):`
`2057`	`2045`	`withopen(recovery_conf,'r')asf:`
`2058`	`2046`	`recovery_conf_content=f.read()`
`2059`	`2047`
`2060`		`-print(recovery_conf_content)`
`2061`		`-`
`2062`	`2048`	`self.assertIn(`
`2063`	`2049`	`"recovery_target_lsn = '{0}'".format(target_lsn),`
`2064`	`2050`	`recovery_conf_content)`
`@@ -2086,8 +2072,6 @@ def test_restore_target_new_options(self):`
`2086`	`2072`	`withopen(recovery_conf,'r')asf:`
`2087`	`2073`	`recovery_conf_content=f.read()`
`2088`	`2074`
`2089`		`-print(recovery_conf_content)`
`2090`		`-`
`2091`	`2075`	`self.assertIn(`
`2092`	`2076`	`"recovery_target_name = '{0}'".format(target_name),`
`2093`	`2077`	`recovery_conf_content)`

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!

Commit16dca32

File tree

2 files changed

2 files changed

`‎tests/external.py‎`

`‎tests/restore.py‎`

0 commit comments