Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbc9a62e

Browse files
committed
Implement get_user
1 parent19e9436 commitbc9a62e

File tree

3 files changed

+12
-26
lines changed

3 files changed

+12
-26
lines changed

‎testgres/node.py

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,10 @@ def __init__(self, name=None, port=None, base_dir=None, conn_params: ConnectionP
156156
else:
157157
self.os_ops=LocalOperations(conn_params)
158158

159-
self.port=portorreserve_port()
160-
161159
self.host=self.os_ops.host
160+
self.port=portorreserve_port()
161+
# Default node username
162+
self.username=default_username()
162163
self.ssh_key=self.os_ops.ssh_key
163164

164165
# defaults for __exit__()
@@ -683,8 +684,6 @@ def slow_start(self, replica=False, dbname='template1', username=None, max_attem
683684
If False, waits for the instance to be in primary mode. Default is False.
684685
max_attempts:
685686
"""
686-
ifnotusername:
687-
username=default_username()
688687
self.start()
689688

690689
ifreplica:
@@ -694,7 +693,7 @@ def slow_start(self, replica=False, dbname='template1', username=None, max_attem
694693
# Call poll_query_until until the expected value is returned
695694
self.poll_query_until(query=query,
696695
dbname=dbname,
697-
username=username,
696+
username=usernameorself.username,
698697
suppress={InternalError,
699698
QueryException,
700699
ProgrammingError,
@@ -967,15 +966,13 @@ def psql(self,
967966
>>> psql(query='select 3', ON_ERROR_STOP=1)
968967
"""
969968

970-
# Set default arguments
971969
dbname=dbnameordefault_dbname()
972-
username=usernameordefault_username()
973970

974971
psql_params= [
975972
self._get_bin_path("psql"),
976973
"-p",str(self.port),
977974
"-h",self.host,
978-
"-U",username,
975+
"-U",usernameorself.username,
979976
"-X",# no .psqlrc
980977
"-A",# unaligned output
981978
"-t",# print rows only
@@ -1087,18 +1084,15 @@ def tmpfile():
10871084
fname=self.os_ops.mkstemp(prefix=TMP_DUMP)
10881085
returnfname
10891086

1090-
# Set default arguments
1091-
dbname=dbnameordefault_dbname()
1092-
username=usernameordefault_username()
10931087
filename=filenameortmpfile()
10941088

10951089
_params= [
10961090
self._get_bin_path("pg_dump"),
10971091
"-p",str(self.port),
10981092
"-h",self.host,
10991093
"-f",filename,
1100-
"-U",username,
1101-
"-d",dbname,
1094+
"-U",usernameorself.username,
1095+
"-d",dbnameordefault_dbname(),
11021096
"-F",format.value
11031097
]# yapf: disable
11041098

@@ -1118,7 +1112,7 @@ def restore(self, filename, dbname=None, username=None):
11181112

11191113
# Set default arguments
11201114
dbname=dbnameordefault_dbname()
1121-
username=usernameordefault_username()
1115+
username=usernameorself.username
11221116

11231117
_params= [
11241118
self._get_bin_path("pg_restore"),
@@ -1388,15 +1382,13 @@ def pgbench(self,
13881382
ifoptionsisNone:
13891383
options= []
13901384

1391-
# Set default arguments
13921385
dbname=dbnameordefault_dbname()
1393-
username=usernameordefault_username()
13941386

13951387
_params= [
13961388
self._get_bin_path("pgbench"),
13971389
"-p",str(self.port),
13981390
"-h",self.host,
1399-
"-U",username,
1391+
"-U",usernameorself.username
14001392
]+options# yapf: disable
14011393

14021394
# should be the last one
@@ -1463,15 +1455,13 @@ def pgbench_run(self, dbname=None, username=None, options=[], **kwargs):
14631455
>>> pgbench_run(time=10)
14641456
"""
14651457

1466-
# Set default arguments
14671458
dbname=dbnameordefault_dbname()
1468-
username=usernameordefault_username()
14691459

14701460
_params= [
14711461
self._get_bin_path("pgbench"),
14721462
"-p",str(self.port),
14731463
"-h",self.host,
1474-
"-U",username,
1464+
"-U",usernameorself.username
14751465
]+options# yapf: disable
14761466

14771467
forkey,valueiniteritems(kwargs):

‎testgres/operations/local_ops.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,6 @@ def set_env(self, var_name, var_val):
130130
# Check if the directory is already in PATH
131131
os.environ[var_name]=var_val
132132

133-
# Get environment variables
134-
defget_user(self):
135-
returnself.usernameorgetpass.getuser()
136-
137133
defget_name(self):
138134
returnos.name
139135

‎testgres/operations/os_ops.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
importgetpass
12
importlocale
23

34
try:
@@ -44,9 +45,8 @@ def set_env(self, var_name, var_val):
4445
# Check if the directory is already in PATH
4546
raiseNotImplementedError()
4647

47-
# Get environment variables
4848
defget_user(self):
49-
raiseNotImplementedError()
49+
returngetpass.getuser()
5050

5151
defget_name(self):
5252
raiseNotImplementedError()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp