openstack/swift
Code Issues Proposed changes

Fix __exit__ calls

Browse Source 
The context manager protocol requires that __exit__ be called with three
args: type, value, and traceback. In some places, we didn't include any
args at all, leading to test failures during clean-up.

Change-Id: I2998830e6eac685b1f753937d12cf5346a4eb081
This commit is contained in:
Tim Burke 2021-01-13 12:42:19 -08:00
parent 3cb58f8efc
commit 6f813f6bfa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/__init__.py
View File

@ -177,7 +177,7 @@ class PatchPolicies(object):
def unpatch_cleanup(cls_self): def unpatch_cleanup(cls_self):
if cls_self._policies_patched: if cls_self._policies_patched:
self.__exit__() self.__exit__(None, None, None)
cls_self._policies_patched = False cls_self._policies_patched = False
def setUp(cls_self): def setUp(cls_self):
@ -204,7 +204,7 @@ class PatchPolicies(object):
try: try:
self._setup_rings() self._setup_rings()
except: # noqa except: # noqa
self.__exit__() self.__exit__(None, None, None)
raise raise
def __exit__(self, *args): def __exit__(self, *args):

4
test/unit/cli/test_container_deleter.py
View File

@ -58,11 +58,11 @@ class TestContainerDeleter(unittest.TestCase):
patcher = mock.patch.object(container_deleter.time, 'time', patcher = mock.patch.object(container_deleter.time, 'time',
side_effect=itertools.count()) side_effect=itertools.count())
patcher.__enter__() patcher.__enter__()
self.addCleanup(patcher.__exit__) self.addCleanup(patcher.__exit__, None, None, None)
patcher = mock.patch.object(container_deleter, 'OBJECTS_PER_UPDATE', 5) patcher = mock.patch.object(container_deleter, 'OBJECTS_PER_UPDATE', 5)
patcher.__enter__() patcher.__enter__()
self.addCleanup(patcher.__exit__) self.addCleanup(patcher.__exit__, None, None, None)
def test_make_delete_jobs(self): def test_make_delete_jobs(self):
ts = '1558463777.42739' ts = '1558463777.42739'