Commitf4686a4

committed

improve test_backup_simple(), set max_attempts=0 in poll_query_until() by default

1 parentb9b1d01 commitf4686a4Copy full SHA for f4686a4

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -915,7 +915,7 @@ def poll_query_until(self,`
`915`	`915`	`dbname,`
`916`	`916`	`query,`
`917`	`917`	`username=None,`
`918`		`-max_attempts=60,`
	`918`	`+max_attempts=0,`
`919`	`919`	`sleep_time=1,`
`920`	`920`	`expected=True,`
`921`	`921`	`raise_programming_error=True,`
`@@ -1027,7 +1027,7 @@ def replicate(self, name, username=None,`
`1027`	`1027`	`backup=self.backup(username=username,xlog_method=xlog_method)`
`1028`	`1028`	`returnbackup.spawn_replica(name,use_logging=use_logging)`
`1029`	`1029`
`1030`		`-defcatchup(self):`
	`1030`	`+defcatchup(self,username=None):`
`1031`	`1031`	`"""`
`1032`	`1032`	`Wait until async replica catches up with its master.`
`1033`	`1033`	`"""`
`@@ -1049,7 +1049,10 @@ def catchup(self):`
`1049`	`1049`
`1050`	`1050`	`try:`
`1051`	`1051`	`lsn=master.execute('postgres',poll_lsn)[0][0]`
`1052`		`-self.poll_query_until('postgres',wait_lsn.format(lsn))`
	`1052`	`+self.poll_query_until(dbname='postgres',`
	`1053`	`+username=username,`
	`1054`	`+query=wait_lsn.format(lsn),`
	`1055`	`+max_attempts=0)# infinite`
`1053`	`1056`	`exceptExceptionase:`
`1054`	`1057`	`raiseCatchUpException(_explain_exception(e))`
`1055`	`1058`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -195,8 +195,18 @@ def test_control_data(self):`
`195`	`195`
`196`	`196`	`deftest_backup_simple(self):`
`197`	`197`	`withget_new_node('master')asmaster:`
`198`		`-master.init(allow_streaming=True).start()`
`199`	`198`
	`199`	`+# enable streaming for backups`
	`200`	`+master.init(allow_streaming=True)`
	`201`	`+`
	`202`	`+# node must be running`
	`203`	`+withself.assertRaises(BackupException):`
	`204`	`+master.backup()`
	`205`	`+`
	`206`	`+# it's time to start node`
	`207`	`+master.start()`
	`208`	`+`
	`209`	`+# fill node with some data`
`200`	`210`	`master.psql('postgres',`
`201`	`211`	`'create table test as select generate_series(1, 4) i')`
`202`	`212`

Comments

(0)