Commit4f38bd5

v.shepard

committed

PBCKP-152 multihost

1 parentf131088 commit4f38bd5Copy full SHA for 4f38bd5

File tree

+18

-28

lines changed

+18

-28

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ def call_initdb(initdb_dir, log=None):`
`39`	`39`	`call_initdb(data_dir,logfile)`
`40`	`40`	`else:`
`41`	`41`	`# Fetch cached initdb dir`
`42`		`-cached_data_dir=testgres_config.cached_initdb_dir`
	`42`	`+cached_data_dir=testgres_config.cached_initdb_dir()`
`43`	`43`
`44`	`44`	`# Initialize cached initdb`
`45`	`45`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,6 @@ def cached_initdb_dir(self):`
`55`	`55`	`defcached_initdb_dir(self,value):`
`56`	`56`	`self._cached_initdb_dir=value`
`57`	`57`
`58`		`-# NOTE: assign initial cached dir for initdb`
`59`		`-ifself.os_ops:`
`60`		`-testgres_config.cached_initdb_dir=self.os_ops.mkdtemp(prefix=TMP_CACHE)`
`61`		`-else:`
`62`		`-testgres_config.cached_initdb_dir=mkdtemp(prefix=TMP_CACHE)`
`63`		`-`
`64`	`58`	`ifvalue:`
`65`	`59`	`cached_initdb_dirs.add(value)`
`66`	`60`	`returntestgres_config.cached_initdb_dir`
`@@ -208,3 +202,7 @@ def configure_testgres(**options):`
`208`	`202`	`"""`
`209`	`203`
`210`	`204`	`testgres_config.update(options)`
	`205`	`+`
	`206`	`+`
	`207`	`+# NOTE: assign initial cached dir for initdb`
	`208`	`+testgres_config.cached_initdb_dir=mkdtemp(prefix=TMP_CACHE)`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ def __init__(self,`
`42`	`42`
`43`	`43`	`self._node=node`
`44`	`44`
`45`		`-self.os_ops=OsOperations(node.host,node.hostname,node.ssh_key,node.username)`
`46`		`-self._connection=self.os_ops.db_connect(dbname=dbname,`
	`45`	`+self._connection=node.os_ops.db_connect(dbname=dbname,`
`47`	`46`	`user=username,`
`48`	`47`	`password=password,`
`49`	`48`	`host=node.host,`

Lines changed: 12 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -262,32 +262,25 @@ def get_user(self):`
`262`	`262`	`user=getpass.getuser()`
`263`	`263`	`returnuser`
`264`	`264`
`265`		`-@contextmanager`
`266`	`265`	`defdb_connect(self,dbname,user,password=None,host='localhost',port=5432):`
`267`	`266`	`ifself.remote:`
`268`		`-withself.ssh_connect()asssh:`
`269`		`-# Set up a local port forwarding on a random port`
`270`		`-local_port=ssh.forward_remote_port(host,port)`
`271`		`-conn=pglib.connect(`
`272`		`-host=host,`
`273`		`-port=local_port,`
`274`		`-dbname=dbname,`
`275`		`-user=user,`
`276`		`-password=password,`
`277`		`- )`
`278`		`-try:`
`279`		`-yieldconn`
`280`		`-finally:`
`281`		`-conn.close()`
`282`		`-ssh.close_forwarded_tcp(local_port)`
	`267`	`+local_port=self.ssh.forward_remote_port(host,port)`
	`268`	`+conn=pglib.connect(`
	`269`	`+host=host,`
	`270`	`+port=local_port,`
	`271`	`+dbname=dbname,`
	`272`	`+user=user,`
	`273`	`+password=password,`
	`274`	`+ )`
`283`	`275`	`else:`
`284`		`-withpglib.connect(`
	`276`	`+conn=pglib.connect(`
`285`	`277`	`host=host,`
`286`	`278`	`port=port,`
`287`	`279`	`dbname=dbname,`
`288`	`280`	`user=user,`
`289`	`281`	`password=password,`
`290`		`- )asconn:`
`291`		`-yieldconn`
	`282`	`+ )`
	`283`	`+returnconn`
	`284`	`+`
`292`	`285`
`293`	`286`

Comments

(0)