Commit7a7dfdd

committed

Merge branch 'version_property'

2 parentsc226759 +8b7d0d1 commit7a7dfddCopy full SHA for 7a7dfdd

File tree

+17

-0

lines changed

+17

-0

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,16 @@ def utils_log_file(self):`
`278`	`278`	`defpg_log_file(self):`
`279`	`279`	`returnos.path.join(self.logs_dir,PG_LOG_FILE)`
`280`	`280`
	`281`	`+@property`
	`282`	`+defversion(self):`
	`283`	`+"""`
	`284`	`+ Return PostgreSQL version for this node.`
	`285`	`+`
	`286`	`+ Returns:`
	`287`	+ Instance of :class:`distutils.version.LooseVersion`.
	`288`	`+ """`
	`289`	`+returnself._pg_version`
	`290`	`+`
`281`	`291`	`def_try_shutdown(self,max_attempts):`
`282`	`292`	`attempts=0`
`283`	`293`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`importtempfile`
`8`	`8`	`importtestgres`
`9`	`9`	`importtime`
	`10`	`+importsix`
`10`	`11`	`importunittest`
`11`	`12`
`12`	`13`	`importlogging.config`
`@@ -857,6 +858,12 @@ def test_version_management(self):`
`857`	`858`	`self.assertTrue(b>c)`
`858`	`859`	`self.assertTrue(a>c)`
`859`	`860`
	`861`	`+version=get_pg_version()`
	`862`	`+withget_new_node()asnode:`
	`863`	`+self.assertTrue(isinstance(version,six.string_types))`
	`864`	`+self.assertTrue(isinstance(node.version,PgVer))`
	`865`	`+self.assertTrue(node.version==version)`
	`866`	`+`
`860`	`867`	`deftest_child_pids(self):`
`861`	`868`	`master_processes= [`
`862`	`869`	`ProcessType.AutovacuumLauncher,`

Comments

(0)