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

Commit458e2b0

Browse files
committed
Fixes and flake8 cleanups
1 parent5f35452 commit458e2b0

File tree

4 files changed

+26
-19
lines changed

4 files changed

+26
-19
lines changed

‎testgres/consts.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
UTILS_LOG_FILE="utils.log"
2626
BACKUP_LOG_FILE="backup.log"
2727

28-
# name of dump/restore formates
29-
DUMP_DIRECTORY="directory"
30-
DEFAULT_DUMP_FORMAT="plain"
31-
3228
# defaults for node settings
3329
MAX_REPLICATION_SLOTS=10
3430
MAX_WAL_SENDERS=10

‎testgres/enums.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,14 @@ def from_process(process):
8585

8686
# default
8787
returnProcessType.Unknown
88+
89+
90+
classDumpFormat(Enum):
91+
"""
92+
Available dump formats
93+
"""
94+
95+
Plain='plain'
96+
Custom='custom'
97+
Directory='directory'
98+
Tar='tar'

‎testgres/node.py‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
fromsiximportraise_from,iteritems
1111
fromtempfileimportmkstemp,mkdtemp
1212

13-
from .enumsimportNodeStatus,ProcessType
13+
from .enumsimport \
14+
NodeStatus, \
15+
ProcessType, \
16+
DumpFormat
1417

1518
from .cacheimportcached_initdb
1619

@@ -32,8 +35,6 @@
3235
RECOVERY_CONF_FILE, \
3336
PG_LOG_FILE, \
3437
UTILS_LOG_FILE, \
35-
DEFAULT_DUMP_FORMAT, \
36-
DUMP_DIRECTORY, \
3738
PG_PID_FILE
3839

3940
from .constsimport \
@@ -805,23 +806,27 @@ def safe_psql(self, query=None, **kwargs):
805806

806807
returnout
807808

808-
defdump(self,filename=None,dbname=None,username=None,format=DEFAULT_DUMP_FORMAT):
809+
defdump(self,
810+
filename=None,
811+
dbname=None,
812+
username=None,
813+
format=DumpFormat.Plain):
809814
"""
810815
Dump database into a file using pg_dump.
811816
NOTE: the file is not removed automatically.
812817
813818
Args:
819+
filename: database dump taken by pg_dump.
814820
dbname: database name to connect to.
815821
username: database user name.
816-
filename: output file.
817-
format: format argument plain/custom/directory/tar
822+
format: format argument plain/custom/directory/tar.
818823
819824
Returns:
820825
Path to a file containing dump.
821826
"""
822827

823828
deftmpfile():
824-
ifformat==DUMP_DIRECTORY:
829+
ifformat==DumpFormat.Directory:
825830
fname=mkdtemp(prefix=TMP_DUMP)
826831
else:
827832
fd,fname=mkstemp(prefix=TMP_DUMP)
@@ -852,7 +857,7 @@ def restore(self, filename, dbname=None, username=None):
852857
Restore database from pg_dump's file.
853858
854859
Args:
855-
filename:input file.
860+
filename:database dump taken by pg_dump in custom/directory/tar formats.
856861
dbname: database name to connect to.
857862
username: database user name.
858863
"""
@@ -862,17 +867,13 @@ def restore(self, filename, dbname=None, username=None):
862867
username=usernameordefault_username()
863868

864869
_params= [
865-
get_bin_path("pg_restore"),
866-
"-p",str(self.port),
867-
"-h",self.host,
868-
"-U",username,
869-
"-d",dbname,
870+
get_bin_path("pg_restore"),"-p",
871+
str(self.port),"-h",self.host,"-U",username,"-d",dbname,
870872
filename
871873
]
872874

873875
execute_utility(_params,self.utils_log_name)
874876

875-
876877
@method_decorator(positional_args_hack(['dbname','query']))
877878
defpoll_query_until(self,
878879
query,

‎tests/test_simple.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
importunittest
1111

1212
importlogging.config
13-
importshutil
1413

1514
fromcontextlibimportcontextmanager
1615
fromdistutils.versionimportLooseVersion

0 commit comments

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