Commit56ddf77

committed

Merge branch 'master' of github.com:postgrespro/testgres

2 parents5a81db1 +7d724ac commit56ddf77Copy full SHA for 56ddf77

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`	`... result = node.safe_psql('postgres', 'select 1')`
`13`	`13`	`... print(result.decode('utf-8').strip())`
`14`	`14`	`... node.stop()`
`15`		`-<testgres.node.PostgresNode object at 0x...>`
	`15`	`+PostgresNode(name='...', port=..., base_dir='...')`
`16`	`16`	`1`
`17`		`-<testgres.node.PostgresNode object at 0x...>`
	`17`	`+PostgresNode(name='...', port=..., base_dir='...')`
`18`	`18`
`19`	`19`	`Or:`
`20`	`20`
`@@ -27,7 +27,7 @@`
`27`	`27`	`... master.execute('postgres', 'insert into test values (0), (1), (2)')`
`28`	`28`	`... replica.catchup() # wait until changes are visible`
`29`	`29`	`... print(replica.execute('postgres', 'select count(*) from test'))`
`30`		`-<testgres.node.PostgresNode object at 0x...>`
	`30`	`+PostgresNode(name='...', port=..., base_dir='...')`
`31`	`31`	`[(3,)]`
`32`	`32`
`33`	`33`	`Copyright (c) 2016, Postgres Professional`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,9 +152,11 @@ def scoped_config(**options):`
`152`	`152`	`Temporarily set custom GlobalConfig options for this context.`
`153`	`153`
`154`	`154`	`Example:`
	`155`	`+ >>> from .api import get_new_node`
`155`	`156`	`>>> with scoped_config(cache_initdb=False):`
`156`	`157`	`... with get_new_node().init().start() as node:`
`157`	`158`	`... print(node.execute('select 1'))`
	`159`	`+ [(1,)]`
`158`	`160`	`"""`
`159`	`161`
`160`	`162`	`try:`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,10 @@ def __exit__(self, type, value, traceback):`
`139`	`139`	`else:`
`140`	`140`	`self._try_shutdown(attempts)`
`141`	`141`
	`142`	`+def__repr__(self):`
	`143`	`+return"{}(name='{}', port={}, base_dir='{}')".format(`
	`144`	`+self.__class__.__name__,self.name,self.port,self.base_dir)`
	`145`	`+`
`142`	`146`	`@property`
`143`	`147`	`defpid(self):`
`144`	`148`	`"""`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`# coding: utf-8`
`3`	`3`
`4`	`4`	`importos`
	`5`	`+importre`
`5`	`6`	`importsubprocess`
`6`	`7`	`importtempfile`
`7`	`8`	`importtestgres`
`@@ -70,6 +71,11 @@ def removing(f):`
`70`	`71`
`71`	`72`
`72`	`73`	`classTestgresTests(unittest.TestCase):`
	`74`	`+deftest_node_repr(self):`
	`75`	`+withget_new_node()asnode:`
	`76`	`+pattern='PostgresNode\(name=\'.+\', port=.+, base_dir=\'.+\'\)'`
	`77`	`+self.assertIsNotNone(re.match(pattern,str(node)))`
	`78`	`+`
`73`	`79`	`deftest_custom_init(self):`
`74`	`80`	`withget_new_node()asnode:`
`75`	`81`	`# enable page checksums`

Comments

(0)