Commite27f01b

committed

minor fixes to ProcessProxy

1 parentc86c0bf commite27f01bCopy full SHA for e27f01b

File tree

-9

lines changed

-9

lines changed

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,8 @@ def __init__(self, process):`
`80`	`80`	`def__getattr__(self,name):`
`81`	`81`	`returngetattr(self.process,name)`
`82`	`82`
`83`		`-def__str__(self):`
`84`		`-pid=self.process.pid`
`85`		`-cmdline=' '.join(self.process.cmdline()).strip()`
`86`		`-return'{} [{}]'.format(cmdline,pid)`
	`83`	`+def__repr__(self):`
	`84`	`+return'{} : {}'.format(str(self.ptype),repr(self.process))`
`87`	`85`
`88`	`86`
`89`	`87`	`classPostgresNode(object):`
`@@ -219,7 +217,8 @@ def source_walsender(self):`
`219`	`217`	`ifchild.pid==int(row[0]):`
`220`	`218`	`returnchild`
`221`	`219`
`222`		`-raiseQueryException("Master doesn't send WAL to {}",self.name)`
	`220`	`+msg="Master doesn't send WAL to {}".format(self.name)`
	`221`	`+raiseTestgresException(msg)`
`223`	`222`
`224`	`223`	`@property`
`225`	`224`	`defmaster(self):`
`@@ -968,7 +967,7 @@ def catchup(self, dbname=None, username=None):`
`968`	`967`	`"""`
`969`	`968`
`970`	`969`	`ifnotself.master:`
`971`		`-raiseCatchUpException("Node doesn't have a master")`
	`970`	`+raiseTestgresException("Node doesn't have a master")`
`972`	`971`
`973`	`972`	`ifpg_version_ge('10'):`
`974`	`973`	`poll_lsn="select pg_current_wal_lsn()::text"`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`ExecUtilException, \`
`21`	`21`	`BackupException, \`
`22`	`22`	`QueryException, \`
`23`		`-CatchUpException, \`
`24`	`23`	`TimeoutException, \`
`25`	`24`	`TestgresException`
`26`	`25`
`@@ -397,7 +396,7 @@ def test_incorrect_catchup(self):`
`397`	`396`	`node.init(allow_streaming=True).start()`
`398`	`397`
`399`	`398`	`# node has no master, can't catch up`
`400`		`-withself.assertRaises(CatchUpException):`
	`399`	`+withself.assertRaises(TestgresException):`
`401`	`400`	`node.catchup()`
`402`	`401`
`403`	`402`	`deftest_dump(self):`
`@@ -759,7 +758,7 @@ def test_child_pids(self):`
`759`	`758`	`replica.stop()`
`760`	`759`
`761`	`760`	`# there should be no walsender after we've stopped replica`
`762`		`-withself.assertRaises(QueryException):`
	`761`	`+withself.assertRaises(TestgresException):`
`763`	`762`	`replica.source_walsender`
`764`	`763`
`765`	`764`

Comments

(0)