Commita2d9113

v.shepard

committed

PBCKP-152 test multihost - 2

1 parent9f97acb commita2d9113Copy full SHA for a2d9113

File tree

+249

-230

lines changed

+249

-230

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ def __init__(self,`
`74`	`74`	`data_dir=os.path.join(self.base_dir,DATA_DIR)`
`75`	`75`
`76`	`76`	`_params= [`
`77`		`-get_bin_path("pg_basebackup"),`
	`77`	`+get_bin_path("pg_basebackup",node.host,node.ssh_key),`
`78`	`78`	`"-p",str(node.port),`
`79`	`79`	`"-h",node.host,`
`80`	`80`	`"-U",username,`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ def call_initdb(initdb_dir, log=None):`
`60`	`60`	`f.write(generate_system_id())# overwrite id`
`61`	`61`
`62`	`62`	`# XXX: build new WAL segment with our system id`
`63`		`-_params= [get_bin_path("pg_resetwal"),"-D",data_dir,"-f"]`
	`63`	`+_params= [get_bin_path("pg_resetwal",host,ssh_key),"-D",data_dir,"-f"]`
`64`	`64`
`65`	`65`
`66`	`66`	`# DDD refactor to PostgresNode method and check execute code`
`67`		`-execute_utility(_params,logfile,hostname=hostname)`
	`67`	`+execute_utility(_params,logfile,host=host,ssh_key=ssh_key)`
`68`	`68`
`69`	`69`	`exceptExecUtilExceptionase:`
`70`	`70`	`msg="Failed to reset WAL for system id"`

Lines changed: 8 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,10 @@`
`1`		`-# coding: utf-8`
`2`		`-`
`3`		`-# we support both pg8000 and psycopg2`
`4`		`-importpsycopg2aspglib`
`5`		`-`
`6`		`-`
`7`	`1`	`from .enumsimportIsolationLevel`
	`2`	`+from .defaultsimportdefault_dbname`
	`3`	`+from .exceptionsimportQueryException`
`8`	`4`
`9`		`-from .defaultsimport \`
`10`		`-default_dbname, \`
`11`		`-default_username`
`12`	`5`
`13`		`-from .exceptionsimportQueryException`
	`6`	`+# we support both pg8000 and psycopg2`
	`7`	`+importpsycopg2aspglib`
`14`	`8`
`15`	`9`	`# export some exceptions`
`16`	`10`	`DatabaseError=pglib.DatabaseError`
`@@ -23,25 +17,14 @@ class NodeConnection(object):`
`23`	`17`	`"""`
`24`	`18`	`Transaction wrapper returned by Node`
`25`	`19`	`"""`
`26`		`-def__init__(self,`
`27`		`-node,`
`28`		`-dbname=None,`
`29`		`-username=None,`
`30`		`-password=None,`
`31`		`-autocommit=False):`
`32`		`-`
	`20`	`+def__init__(self,node,dbname=None,username=None,password=None,autocommit=False):`
`33`	`21`	`# Set default arguments`
`34`	`22`	`dbname=dbnameordefault_dbname()`
`35`		`-username=usernameordefault_username()`
	`23`	`+username=usernameor'dev'`
`36`	`24`
`37`	`25`	`self._node=node`
`38`		`-`
`39`		`-self._connection=pglib.connect(database=dbname,`
`40`		`-user=username,`
`41`		`-password=password,`
`42`		`-host=node.host,`
`43`		`-port=node.port)`
`44`		`-`
	`26`	`+self._connection=pglib.connect(database=dbname,user=username,password=password,`
	`27`	`+host=node.host,port=node.port)`
`45`	`28`	`self._connection.autocommit=autocommit`
`46`	`29`	`self._cursor=self.connection.cursor()`
`47`	`30`

Comments

(0)