NotificationsYou must be signed in to change notification settings
Fork91
Star761

Commit00cbcc8

committed

tests: fixes

1 parent5cf1556 commit00cbcc8Copy full SHA for 00cbcc8

File tree

2 files changed

+20

-10

lines changed

tests
- external.py
- merge.py

2 files changed

+20

-10

lines changed

`‎tests/external.py‎`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,7 @@ def test_external_merge_skip_external_dirs(self):`
`866`	`866`
`867`	`867`	`# @unittest.expectedFailure`
`868`	`868`	`# @unittest.skip("skip")`
`869`		`-deftest_external_merge_single(self):`
	`869`	`+deftest_external_merge_1(self):`
`870`	`870`	`""""""`
`871`	`871`	`fname=self.id().split('.')[3]`
`872`	`872`	`backup_dir=os.path.join(self.tmp_path,module_name,fname,'backup')`
`@@ -1012,7 +1012,9 @@ def test_external_merge_3(self):`
`1012`	`1012`	`pgdata=self.pgdata_content(`
`1013`	`1013`	`node.base_dir,exclude_dirs=['logs'])`
`1014`	`1014`
`1015`		`-self.merge_backup(backup_dir,'node',backup_id=backup_id)`
	`1015`	`+self.merge_backup(`
	`1016`	`+backup_dir,'node',backup_id=backup_id,`
	`1017`	`+options=['--log-level-file=verbose'])`
`1016`	`1018`
`1017`	`1019`	`# RESTORE`
`1018`	`1020`	`node.cleanup()`
`@@ -1040,7 +1042,7 @@ def test_external_merge_3(self):`
`1040`	`1042`
`1041`	`1043`	`# @unittest.expectedFailure`
`1042`	`1044`	`# @unittest.skip("skip")`
`1043`		`-deftest_external_merge_double(self):`
	`1045`	`+deftest_external_merge_2(self):`
`1044`	`1046`	`""""""`
`1045`	`1047`	`fname=self.id().split('.')[3]`
`1046`	`1048`	`backup_dir=os.path.join(self.tmp_path,module_name,fname,'backup')`
`@@ -1446,7 +1448,6 @@ def test_merge_external_changed_data(self):`
`1446`	`1448`	`# Clean after yourself`
`1447`	`1449`	`self.del_test_dir(module_name,fname)`
`1448`	`1450`
`1449`		`-`
`1450`	`1451`	`# @unittest.expectedFailure`
`1451`	`1452`	`# @unittest.skip("skip")`
`1452`	`1453`	`deftest_restore_skip_external(self):`

`‎tests/merge.py‎`

Lines changed: 15 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1721,7 +1721,7 @@ def test_failed_merge_after_delete(self):`
`1721`	`1721`
`1722`	`1722`	`# backup half-merged`
`1723`	`1723`	`self.assertEqual(`
`1724`		`-'OK',self.show_pb(backup_dir,'node')[0]['status'])`
	`1724`	`+'MERGING',self.show_pb(backup_dir,'node')[0]['status'])`
`1725`	`1725`
`1726`	`1726`	`self.assertEqual(`
`1727`	`1727`	`full_id,self.show_pb(backup_dir,'node')[0]['id'])`
`@@ -1753,23 +1753,31 @@ def test_failed_merge_after_delete_1(self):`
`1753`	`1753`	`self.set_archiving(backup_dir,'node',node)`
`1754`	`1754`	`node.slow_start()`
`1755`	`1755`
`1756`		`-# add database`
`1757`		`-node.pgbench_init(scale=1)`
`1758`		`-`
`1759`	`1756`	`# take FULL backup`
`1760`	`1757`	`full_id=self.backup_node(`
`1761`	`1758`	`backup_dir,'node',node,options=['--stream'])`
`1762`	`1759`
	`1760`	`+node.pgbench_init(scale=1)`
	`1761`	`+`
	`1762`	`+page_1=self.backup_node(`
	`1763`	`+backup_dir,'node',node,backup_type='page')`
	`1764`	`+`
	`1765`	`+# Change FULL B backup status to ERROR`
	`1766`	`+self.change_backup_status(backup_dir,'node',page_1,'ERROR')`
	`1767`	`+`
`1763`	`1768`	`pgdata=self.pgdata_content(node.data_dir)`
`1764`	`1769`
`1765`		`-#drop database`
	`1770`	`+#add data`
`1766`	`1771`	`pgbench=node.pgbench(options=['-T','10','-c','2','--no-vacuum'])`
`1767`	`1772`	`pgbench.wait()`
`1768`	`1773`
`1769`	`1774`	`# take PAGE backup`
`1770`	`1775`	`page_id=self.backup_node(`
`1771`	`1776`	`backup_dir,'node',node,backup_type='page')`
`1772`	`1777`
	`1778`	`+# Change FULL B backup status to ERROR`
	`1779`	`+self.change_backup_status(backup_dir,'node',page_1,'OK')`
	`1780`	`+`
`1773`	`1781`	`gdb=self.merge_backup(`
`1774`	`1782`	`backup_dir,'node',page_id,`
`1775`	`1783`	`gdb=True,options=['--log-level-console=verbose'])`
`@@ -1827,7 +1835,8 @@ def test_merge_backup_from_future(self):`
`1827`	`1835`	`node.pgbench_init(scale=3)`
`1828`	`1836`
`1829`	`1837`	`# Take PAGE from future`
`1830`		`-backup_id=self.backup_node(backup_dir,'node',node,backup_type='page')`
	`1838`	`+backup_id=self.backup_node(`
	`1839`	`+backup_dir,'node',node,backup_type='page')`
`1831`	`1840`
`1832`	`1841`	`withopen(`
`1833`	`1842`	`os.path.join(`

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!

Commit00cbcc8

File tree

2 files changed

2 files changed

`‎tests/external.py‎`

`‎tests/merge.py‎`

0 commit comments