Commit6a8e125

v.shepard

committed

PBCKP-566 test multihost

1 parente88b461 commit6a8e125Copy full SHA for 6a8e125

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ def __repr__(self):`
`110`	`110`
`111`	`111`	`classPostgresNode(object):`
`112`	`112`	`def__init__(self,name=None,port=None,base_dir=None,`
`113`		`-host='127.0.0.1',hostname='locahost'):`
	`113`	`+host='127.0.0.1',hostname='locahost',ssh_key=None):`
`114`	`114`	`"""`
`115`	`115`	`PostgresNode constructor.`
`116`	`116`
`@@ -130,6 +130,7 @@ def __init__(self, name=None, port=None, base_dir=None,`
`130`	`130`	`# basic`
`131`	`131`	`self.host=host`
`132`	`132`	`self.hostname=hostname`
	`133`	`+self.ssh_key=ssh_key`
`133`	`134`	`self.name=nameorgenerate_app_name()`
`134`	`135`	`self.port=portorreserve_port()`
`135`	`136`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,9 @@ def execute_utility(args, logfile=None, hostname='localhost', ssh_key=None):`
`68`	`68`	`"""`
`69`	`69`
`70`	`70`
`71`		`-ifhostname!='localhost':`
	`71`	`+ifhostname!='localhost':`
`72`	`72`	`conn=Connection(`
`73`		`-host="enterprise-14",`
	`73`	`+host="enterprise-14-2",`
`74`	`74`	`user="dev",`
`75`	`75`	`connect_kwargs={`
`76`	`76`	`# XXX pass SSH key path`
`@@ -80,11 +80,11 @@ def execute_utility(args, logfile=None, hostname='localhost', ssh_key=None):`
`80`	`80`
`81`	`81`	`# TODO skip remote ssh run if we are on the localhost.`
`82`	`82`	`#result = conn.run(hostname, hide=True)`
`83`		`-# add logger`
	`83`	`+# add logger`
`84`	`84`	`#`
`85`	`85`	`cmd=' '.join(args)`
`86`	`86`	`result=conn.run(cmd,hide=True)`
`87`		`-`
	`87`	`+`
`88`	`88`	`returnresult`
`89`	`89`
`90`	`90`

Comments

(0)