From 6f813f6bfa8fc40754fa6ca65695399d24d62e4c Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Wed, 13 Jan 2021 12:42:19 -0800 Subject: [PATCH] Fix __exit__ calls 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 --- test/unit/__init__.py | 4 ++-- test/unit/cli/test_container_deleter.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/unit/__init__.py b/test/unit/__init__.py index 34518677c7..90e141b880 100644 --- a/test/unit/__init__.py +++ b/test/unit/__init__.py @@ -177,7 +177,7 @@ class PatchPolicies(object): def unpatch_cleanup(cls_self): if cls_self._policies_patched: - self.__exit__() + self.__exit__(None, None, None) cls_self._policies_patched = False def setUp(cls_self): @@ -204,7 +204,7 @@ class PatchPolicies(object): try: self._setup_rings() except: # noqa - self.__exit__() + self.__exit__(None, None, None) raise def __exit__(self, *args): diff --git a/test/unit/cli/test_container_deleter.py b/test/unit/cli/test_container_deleter.py index d8f39cdf5d..6cf91d6bd6 100644 --- a/test/unit/cli/test_container_deleter.py +++ b/test/unit/cli/test_container_deleter.py @@ -58,11 +58,11 @@ class TestContainerDeleter(unittest.TestCase): patcher = mock.patch.object(container_deleter.time, 'time', side_effect=itertools.count()) patcher.__enter__() - self.addCleanup(patcher.__exit__) + self.addCleanup(patcher.__exit__, None, None, None) patcher = mock.patch.object(container_deleter, 'OBJECTS_PER_UPDATE', 5) patcher.__enter__() - self.addCleanup(patcher.__exit__) + self.addCleanup(patcher.__exit__, None, None, None) def test_make_delete_jobs(self): ts = '1558463777.42739'