openstack/swift
Code Issues Proposed changes

Merge "Cleanup test tempdirs in tearDown"

Browse Source
This commit is contained in:
Jenkins 2017-09-01 16:56:42 +00:00 committed by Gerrit Code Review
commit 6da17e9923
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/unit/container/test_sync_store.py
View File

@ -69,7 +69,7 @@ class TestContainerSyncStore(unittest.TestCase):
with open(db_file, 'w') as outfile: with open(db_file, 'w') as outfile:
outfile.write('%s' % db_file) outfile.write('%s' % db_file)
def teardown(self): def tearDown(self):
rmtree(self.test_dir_prefix) rmtree(self.test_dir_prefix)
def pick_dbfile(self): def pick_dbfile(self):

8
test/unit/proxy/test_server.py
View File

@ -6603,10 +6603,16 @@ class TestECMismatchedFA(unittest.TestCase):
class TestECGets(unittest.TestCase): class TestECGets(unittest.TestCase):
def setUp(self):
super(TestECGets, self).setUp()
self.tempdir = mkdtemp()
def tearDown(self): def tearDown(self):
rmtree(self.tempdir, ignore_errors=True)
prosrv = _test_servers[0] prosrv = _test_servers[0]
# don't leak error limits and poison other tests # don't leak error limits and poison other tests
prosrv._error_limiting = {} prosrv._error_limiting = {}
super(TestECGets, self).tearDown()
def _setup_nodes_and_do_GET(self, objs, node_state): def _setup_nodes_and_do_GET(self, objs, node_state):
""" """
@ -6666,7 +6672,7 @@ class TestECGets(unittest.TestCase):
# move all hash dir files to per-node, per-obj tempdir # move all hash dir files to per-node, per-obj tempdir
for node_index, hash_dir in node_hash_dirs.items(): for node_index, hash_dir in node_hash_dirs.items():
node_tmp_dirs[node_index][ref] = mkdtemp() node_tmp_dirs[node_index][ref] = mkdtemp(dir=self.tempdir)
for f in os.listdir(hash_dir): for f in os.listdir(hash_dir):
move(os.path.join(hash_dir, f), move(os.path.join(hash_dir, f),
os.path.join(node_tmp_dirs[node_index][ref], f)) os.path.join(node_tmp_dirs[node_index][ref], f))