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

Commitbe1e3c5

Browse files
committed
small refactoring
1 parente1b5a51 commitbe1e3c5

File tree

5 files changed

+28
-30
lines changed

5 files changed

+28
-30
lines changed

‎testgres/backup.py

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
# coding: utf-8
22

33
importos
4-
importshutil
54

5+
fromshutilimportrmtree,copytree
66
fromsiximportraise_from
77
fromtempfileimportmkdtemp
88

9-
from .configimporttestgres_config
10-
119
from .constsimport \
1210
DATA_DIR, \
1311
TMP_NODE, \
@@ -55,8 +53,7 @@ def __init__(self,
5553
# yapf: disable
5654
# Set default arguments
5755
username=usernameordefault_username()
58-
base_dir=base_dirormkdtemp(prefix=TMP_BACKUP,
59-
dir=testgres_config.temp_dir)
56+
base_dir=base_dirormkdtemp(prefix=TMP_BACKUP)
6057

6158
# public
6259
self.original_node=node
@@ -103,15 +100,14 @@ def _prepare_dir(self, destroy):
103100
available=notdestroy
104101

105102
ifavailable:
106-
dest_base_dir=mkdtemp(prefix=TMP_NODE,
107-
dir=testgres_config.temp_dir)
103+
dest_base_dir=mkdtemp(prefix=TMP_NODE)
108104

109105
data1=os.path.join(self.base_dir,DATA_DIR)
110106
data2=os.path.join(dest_base_dir,DATA_DIR)
111107

112108
try:
113109
# Copy backup to new data dir
114-
shutil.copytree(data1,data2)
110+
copytree(data1,data2)
115111
exceptExceptionase:
116112
raise_from(BackupException('Failed to copy files'),e)
117113
else:
@@ -140,8 +136,7 @@ def spawn_primary(self, name=None, destroy=True):
140136

141137
# Build a new PostgresNode
142138
from .nodeimportPostgresNode
143-
node=PostgresNode(name=name,
144-
base_dir=base_dir)
139+
node=PostgresNode(name=name,base_dir=base_dir)
145140

146141
# New nodes should always remove dir tree
147142
node._should_rm_dirs=True
@@ -164,8 +159,7 @@ def spawn_replica(self, name=None, destroy=True):
164159
"""
165160

166161
# Build a new PostgresNode
167-
node=self.spawn_primary(name=name,
168-
destroy=destroy)
162+
node=self.spawn_primary(name=name,destroy=destroy)
169163

170164
# Assign it a master and a recovery file (private magic)
171165
node._assign_master(self.original_node)
@@ -175,5 +169,5 @@ def spawn_replica(self, name=None, destroy=True):
175169

176170
defcleanup(self):
177171
ifself._available:
178-
shutil.rmtree(self.base_dir,ignore_errors=True)
172+
rmtree(self.base_dir,ignore_errors=True)
179173
self._available=False

‎testgres/cache.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
importio
44
importos
5-
importshutil
65

6+
fromshutilimportcopytree
77
fromsiximportraise_from
88

99
from .configimporttestgres_config
@@ -46,7 +46,7 @@ def call_initdb(initdb_dir, log=None):
4646

4747
try:
4848
# Copy cached initdb to current data dir
49-
shutil.copytree(cached_data_dir,data_dir)
49+
copytree(cached_data_dir,data_dir)
5050

5151
# Assign this node a unique system id if asked to
5252
iftestgres_config.cached_initdb_unique:

‎testgres/config.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
importatexit
44
importcopy
5-
importshutil
5+
importtempfile
66

77
fromcontextlibimportcontextmanager
8+
fromshutilimportrmtree
89
fromtempfileimportmkdtemp
910

1011
from .constsimportTMP_CACHE
@@ -39,8 +40,6 @@ class GlobalConfig(object):
3940

4041
cache_pg_config=True
4142

42-
temp_dir=None
43-
4443
use_python_logging=False
4544
error_log_lines=20
4645

@@ -59,6 +58,14 @@ def cached_initdb_dir(self, value):
5958
ifvalue:
6059
cached_initdb_dirs.add(value)
6160

61+
@property
62+
deftemp_dir(self):
63+
returntempfile.tempdir
64+
65+
@temp_dir.setter
66+
deftemp_dir(self,value):
67+
tempfile.tempdir=value
68+
6269
def__init__(self,**options):
6370
self.update(options)
6471

@@ -110,9 +117,9 @@ def copy(self):
110117

111118

112119
@atexit.register
113-
defrm_cached_initdb_dirs():
120+
def_rm_cached_initdb_dirs():
114121
fordincached_initdb_dirs:
115-
shutil.rmtree(d,ignore_errors=True)
122+
rmtree(d,ignore_errors=True)
116123

117124

118125
defpush_config(**options):
@@ -170,7 +177,5 @@ def configure_testgres(**options):
170177
testgres_config.update(options)
171178

172179

173-
# yapf: disable
174180
# NOTE: assign initial cached dir for initdb
175-
testgres_config.cached_initdb_dir=mkdtemp(prefix=TMP_CACHE,
176-
dir=testgres_config.temp_dir)
181+
testgres_config.cached_initdb_dir=mkdtemp(prefix=TMP_CACHE)

‎testgres/node.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
importio
44
importos
5-
importshutil
65
importsix
76
importsubprocess
87
importtime
98

109
fromenumimportEnum
10+
fromshutilimportrmtree
1111
fromsiximportraise_from
1212
fromtempfileimportmkstemp,mkdtemp
1313

@@ -203,8 +203,7 @@ def _create_recovery_conf(self, username):
203203

204204
def_prepare_dirs(self):
205205
ifnotself.base_dir:
206-
self.base_dir=mkdtemp(prefix=TMP_NODE,
207-
dir=testgres_config.temp_dir)
206+
self.base_dir=mkdtemp(prefix=TMP_NODE)
208207

209208
ifnotos.path.exists(self.base_dir):
210209
os.makedirs(self.base_dir)
@@ -613,7 +612,7 @@ def cleanup(self, max_attempts=3):
613612
else:
614613
rm_dir=self.data_dir# just data, save logs
615614

616-
shutil.rmtree(rm_dir,ignore_errors=True)
615+
rmtree(rm_dir,ignore_errors=True)
617616

618617
returnself
619618

@@ -711,7 +710,7 @@ def dump(self, filename=None, dbname=None, username=None):
711710
"""
712711

713712
deftmpfile():
714-
fd,fname=mkstemp(prefix=TMP_DUMP,dir=testgres_config.temp_dir)
713+
fd,fname=mkstemp(prefix=TMP_DUMP)
715714
os.close(fd)
716715
returnfname
717716

‎tests/test_simple.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# coding: utf-8
33

44
importos
5-
importshutil
65
importsubprocess
76
importtempfile
87
importtestgres
@@ -13,6 +12,7 @@
1312

1413
fromcontextlibimportcontextmanager
1514
fromdistutils.versionimportLooseVersion
15+
fromshutilimportrmtree
1616

1717
fromtestgresimport \
1818
InitNodeException, \
@@ -139,7 +139,7 @@ def test_node_exit(self):
139139

140140
# we should save the DB for "debugging"
141141
self.assertTrue(os.path.exists(base_dir))
142-
shutil.rmtree(base_dir,ignore_errors=True)
142+
rmtree(base_dir,ignore_errors=True)
143143

144144
withget_new_node().init()asnode:
145145
base_dir=node.base_dir

0 commit comments

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