Commita0ebde3

committed

Return 0 when no pid, do the same for backend pid, and add packages to Dockerfile template

1 parent61b5d44 commita0ebde3Copy full SHA for a0ebde3

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ FROM postgres:${PG_VERSION}-alpine`
`2`	`2`
`3`	`3`	`ENV PYTHON=python${PYTHON_VERSION}`
`4`	`4`	`RUN if [ "${PYTHON_VERSION}" = "2" ] ; then \`
`5`		`-apk add --no-cache curl python2 py-virtualenv py-pip; \`
	`5`	`+apk add --no-cache curl python2python2-dev gccpy-virtualenv py-pip; \`
`6`	`6`	`fi`
`7`	`7`	`RUN if [ "${PYTHON_VERSION}" = "3" ] ; then \`
`8`		`-apk add --no-cache curl python3 py-virtualenv; \`
	`8`	`+apk add --no-cache curl python3python3-dev gccpy-virtualenv; \`
`9`	`9`	`fi`
`10`	`10`	`ENV LANG=C.UTF-8`
`11`	`11`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ def __init__(self, node, dbname=None, username=None, password=None):`
`34`	`34`	`username=usernameordefault_username()`
`35`	`35`
`36`	`36`	`self._node=node`
`37`		`-self._backend_pid=None`
	`37`	`+self._backend_pid=0`
`38`	`38`
`39`	`39`	`self._connection=pglib.connect(`
`40`	`40`	`database=dbname,`
`@@ -55,7 +55,7 @@ def connection(self):`
`55`	`55`
`56`	`56`	`@property`
`57`	`57`	`defbackend_pid(self):`
`58`		`-ifself._backend_pidisNone:`
	`58`	`+ifnotself._backend_pid:`
`59`	`59`	`self._backend_pid=self.execute("select pg_backend_pid();")[0][0]`
`60`	`60`	`returnself._backend_pid`
`61`	`61`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ def get_main_pid(self):`
`439`	`439`	`returnint(f.readline())`
`440`	`440`
`441`	`441`	`# for clarity`
`442`		`-returnNone`
	`442`	`+return0`
`443`	`443`
`444`	`444`	`defget_child_processes(self):`
`445`	`445`	`''' Returns child processes for this node '''`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -205,27 +205,27 @@ def test_status(self):`
`205`	`205`
`206`	`206`	`# check statuses after each operation`
`207`	`207`	`withget_new_node()asnode:`
`208`		`-self.assertIsNone(node.pid)`
	`208`	`+self.assertEqual(node.pid,0)`
`209`	`209`	`self.assertEqual(node.status(),NodeStatus.Uninitialized)`
`210`	`210`
`211`	`211`	`node.init()`
`212`	`212`
`213`		`-self.assertIsNone(node.pid)`
	`213`	`+self.assertEqual(node.pid,0)`
`214`	`214`	`self.assertEqual(node.status(),NodeStatus.Stopped)`
`215`	`215`
`216`	`216`	`node.start()`
`217`	`217`
`218`		`-self.assertIsNotNone(node.pid)`
	`218`	`+self.assertNotEqual(node.pid,0)`
`219`	`219`	`self.assertEqual(node.status(),NodeStatus.Running)`
`220`	`220`
`221`	`221`	`node.stop()`
`222`	`222`
`223`		`-self.assertIsNone(node.pid)`
	`223`	`+self.assertEqual(node.pid,0)`
`224`	`224`	`self.assertEqual(node.status(),NodeStatus.Stopped)`
`225`	`225`
`226`	`226`	`node.cleanup()`
`227`	`227`
`228`		`-self.assertIsNone(node.pid)`
	`228`	`+self.assertEqual(node.pid,0)`
`229`	`229`	`self.assertEqual(node.status(),NodeStatus.Uninitialized)`
`230`	`230`
`231`	`231`	`deftest_psql(self):`

Comments

(0)