Commit390ed7c

committed

Raise exception for functions that require psutil when psutil is not installed

1 parentf6d1e5b commit390ed7cCopy full SHA for 390ed7c

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -445,8 +445,7 @@ def get_child_processes(self):`
`445`	`445`	`''' Returns child processes for this node '''`
`446`	`446`
`447`	`447`	`ifpsutilisNone:`
`448`		`-warnings.warn("psutil module is not installed")`
`449`		`-returnNone`
	`448`	`+raiseTestgresException("psutil module is not installed")`
`450`	`449`
`451`	`450`	`try:`
`452`	`451`	`postmaster=psutil.Process(self.pid)`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@`
`21`	`21`	`BackupException, \`
`22`	`22`	`QueryException, \`
`23`	`23`	`CatchUpException, \`
`24`		`-TimeoutException`
	`24`	`+TimeoutException, \`
	`25`	`+TestgresException`
`25`	`26`
`26`	`27`	`fromtestgresimport \`
`27`	`28`	`TestgresConfig, \`
`@@ -739,8 +740,10 @@ def test_pids(self):`
`739`	`740`	`withbackup.spawn_replica('repl',True)asrepl:`
`740`	`741`	`repl.start()`
`741`	`742`	`ifpsutilisNone:`
`742`		`-self.assertIsNone(master.auxiliary_pids)`
`743`		`-self.assertIsNone(repl.auxiliary_pids)`
	`743`	`+withself.assertRaises(TestgresException):`
	`744`	`+master.auxiliary_pids`
	`745`	`+withself.assertRaises(TestgresException):`
	`746`	`+self.assertIsNone(repl.auxiliary_pids)`
`744`	`747`	`else:`
`745`	`748`	`master_pids=master.auxiliary_pids`
`746`	`749`	`forptypeinmaster_processes:`

Comments

(0)