Skip to content

bpo-21600: Fix mock.patch.dict to be stopped with mock.patch.stopall #17606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions Lib/unittest/mock.py
Original file line number Diff line number Diff line change
Expand Up @@ -1853,8 +1853,23 @@ def __exit__(self, *args):
self._unpatch_dict()
return False

start = __enter__
stop = __exit__

def start(self):
"""Activate a patch, returning any created mock."""
result = self.__enter__()
_patch._active_patches.append(self)
return result


def stop(self):
"""Stop an active patch."""
try:
_patch._active_patches.remove(self)
except ValueError:
# If the patch hasn't been started this will fail
pass

return self.__exit__()


def _clear_dict(in_dict):
Expand Down
50 changes: 50 additions & 0 deletions Lib/unittest/test/testmock/testpatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -1807,6 +1807,56 @@ def stop(self):

self.assertEqual(stopped, ["three", "two", "one"])

def test_patch_dict_stopall(self):
dic1 = {}
dic2 = {1: 'a'}
dic3 = {1: 'A', 2: 'B'}
origdic1 = dic1.copy()
origdic2 = dic2.copy()
origdic3 = dic3.copy()
patch.dict(dic1, {1: 'I', 2: 'II'}).start()
patch.dict(dic2, {2: 'b'}).start()

@patch.dict(dic3)
def patched():
del dic3[1]

patched()
self.assertNotEqual(dic1, origdic1)
self.assertNotEqual(dic2, origdic2)
self.assertEqual(dic3, origdic3)

patch.stopall()

self.assertEqual(dic1, origdic1)
self.assertEqual(dic2, origdic2)
self.assertEqual(dic3, origdic3)


def test_patch_and_patch_dict_stopall(self):
original_unlink = os.unlink
original_chdir = os.chdir
dic1 = {}
dic2 = {1: 'A', 2: 'B'}
origdic1 = dic1.copy()
origdic2 = dic2.copy()

patch('os.unlink', something).start()
patch('os.chdir', something_else).start()
patch.dict(dic1, {1: 'I', 2: 'II'}).start()
patch.dict(dic2).start()
del dic2[1]

self.assertIsNot(os.unlink, original_unlink)
self.assertIsNot(os.chdir, original_chdir)
self.assertNotEqual(dic1, origdic1)
self.assertNotEqual(dic2, origdic2)
patch.stopall()
self.assertIs(os.unlink, original_unlink)
self.assertIs(os.chdir, original_chdir)
self.assertEqual(dic1, origdic1)
self.assertEqual(dic2, origdic2)


def test_special_attrs(self):
def foo(x=0):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :func:`mock.patch.stopall` to stop active patches that were created with
:func:`mock.patch.dict`.