NotificationsYou must be signed in to change notification settings
Fork35
Star147

Commite6fc5f1

committed

Override self.username in both operations

1 parent154d000 commite6fc5f1Copy full SHA for e6fc5f1

File tree

4 files changed

+11

-10

lines changed

testgres
- node.py
- operations

4 files changed

+11

-10

lines changed

`‎testgres/node.py`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@`
`63`	`63`
`64`	`64`	`from .defaultsimport \`
`65`	`65`	`default_dbname, \`
`66`		`-default_username, \`
`67`	`66`	`generate_app_name`
`68`	`67`
`69`	`68`	`from .exceptionsimport \`
`@@ -158,7 +157,6 @@ def __init__(self, name=None, port=None, base_dir=None, conn_params: ConnectionP`
`158`	`157`
`159`	`158`	`self.host=self.os_ops.host`
`160`	`159`	`self.port=portorreserve_port()`
`161`		`-self.username=self.os_ops.username`
`162`	`160`	`self.ssh_key=self.os_ops.ssh_key`
`163`	`161`
`164`	`162`	`# defaults for __exit__()`
`@@ -692,7 +690,7 @@ def slow_start(self, replica=False, dbname='template1', username=None, max_attem`
`692`	`690`	`# Call poll_query_until until the expected value is returned`
`693`	`691`	`self.poll_query_until(query=query,`
`694`	`692`	`dbname=dbname,`
`695`		`-username=usernameorself.username,`
	`693`	`+username=usernameorself.os_ops.username,`
`696`	`694`	`suppress={InternalError,`
`697`	`695`	`QueryException,`
`698`	`696`	`ProgrammingError,`
`@@ -971,7 +969,7 @@ def psql(self,`
`971`	`969`	`self._get_bin_path("psql"),`
`972`	`970`	`"-p",str(self.port),`
`973`	`971`	`"-h",self.host,`
`974`		`-"-U",usernameorself.username,`
	`972`	`+"-U",usernameorself.os_ops.username,`
`975`	`973`	`"-X",# no .psqlrc`
`976`	`974`	`"-A",# unaligned output`
`977`	`975`	`"-t",# print rows only`
`@@ -1090,7 +1088,7 @@ def tmpfile():`
`1090`	`1088`	`"-p",str(self.port),`
`1091`	`1089`	`"-h",self.host,`
`1092`	`1090`	`"-f",filename,`
`1093`		`-"-U",usernameorself.username,`
	`1091`	`+"-U",usernameorself.os_ops.username,`
`1094`	`1092`	`"-d",dbnameordefault_dbname(),`
`1095`	`1093`	`"-F",format.value`
`1096`	`1094`	`]# yapf: disable`
`@@ -1111,7 +1109,7 @@ def restore(self, filename, dbname=None, username=None):`
`1111`	`1109`
`1112`	`1110`	`# Set default arguments`
`1113`	`1111`	`dbname=dbnameordefault_dbname()`
`1114`		`-username=usernameorself.username`
	`1112`	`+username=usernameorself.os_ops.username`
`1115`	`1113`
`1116`	`1114`	`_params= [`
`1117`	`1115`	`self._get_bin_path("pg_restore"),`
`@@ -1387,7 +1385,7 @@ def pgbench(self,`
`1387`	`1385`	`self._get_bin_path("pgbench"),`
`1388`	`1386`	`"-p",str(self.port),`
`1389`	`1387`	`"-h",self.host,`
`1390`		`-"-U",usernameorself.username`
	`1388`	`+"-U",usernameorself.os_ops.username`
`1391`	`1389`	`]+options# yapf: disable`
`1392`	`1390`
`1393`	`1391`	`# should be the last one`
`@@ -1460,7 +1458,7 @@ def pgbench_run(self, dbname=None, username=None, options=[], **kwargs):`
`1460`	`1458`	`self._get_bin_path("pgbench"),`
`1461`	`1459`	`"-p",str(self.port),`
`1462`	`1460`	`"-h",self.host,`
`1463`		`-"-U",usernameorself.username`
	`1461`	`+"-U",usernameorself.os_ops.username`
`1464`	`1462`	`]+options# yapf: disable`
`1465`	`1463`
`1466`	`1464`	`forkey,valueiniteritems(kwargs):`

`‎testgres/operations/local_ops.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ def __init__(self, conn_params=None):`
`38`	`38`	`self.host=conn_params.host`
`39`	`39`	`self.ssh_key=None`
`40`	`40`	`self.remote=False`
	`41`	`+self.username=conn_params.usernameorgetpass.getuser()`
`41`	`42`
`42`	`43`	`@staticmethod`
`43`	`44`	`def_raise_exec_exception(message,command,exit_code,output):`

`‎testgres/operations/os_ops.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ def get_default_encoding():`
`24`	`24`	`classOsOperations:`
`25`	`25`	`def__init__(self,username=None):`
`26`	`26`	`self.ssh_key=None`
`27`		`-self.username=usernameorself.get_user()`
	`27`	`+self.username=usernameorgetpass.getuser()`
`28`	`28`
`29`	`29`	`# Command execution`
`30`	`30`	`defexec_command(self,cmd,**kwargs):`
`@@ -46,7 +46,7 @@ def set_env(self, var_name, var_val):`
`46`	`46`	`raiseNotImplementedError()`
`47`	`47`
`48`	`48`	`defget_user(self):`
`49`		`-returngetpass.getuser()`
	`49`	`+returnself.username`
`50`	`50`
`51`	`51`	`defget_name(self):`
`52`	`52`	`raiseNotImplementedError()`

`‎testgres/operations/remote_ops.py`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+importgetpass`
`1`	`2`	`importos`
`2`	`3`	`importsocket`
`3`	`4`	`importsubprocess`
`@@ -52,6 +53,7 @@ def __init__(self, conn_params: ConnectionParams):`
`52`	`53`	`ifself.port:`
`53`	`54`	`self.ssh_args+= ["-p",self.port]`
`54`	`55`	`self.remote=True`
	`56`	`+self.username=conn_params.usernameorgetpass.getuser()`
`55`	`57`	`self.ssh_dest=f"{self.username}@{self.host}"ifconn_params.usernameelseself.host`
`56`	`58`	`self.add_known_host(self.host)`
`57`	`59`	`self.tunnel_process=None`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite6fc5f1

File tree

4 files changed

4 files changed

`‎testgres/node.py`

`‎testgres/operations/local_ops.py`

`‎testgres/operations/os_ops.py`

`‎testgres/operations/remote_ops.py`

0 commit comments