Merge pull request #3 from nicoddemus/issue-2

un-patching correctly when patching objects twice

Author: nicoddemus

pytest_mock.py

@@ -24,7 +24,7 @@ def stopall(self):
         Stop all patchers started by this fixture. Can be safely called multiple
         times.
         """
-        for p in self._patches:
+        for p in reversed(self._patches):
             p.stop()
         self._patches[:] = []
 

test_pytest_mock.py

@@ -74,6 +74,7 @@ def test_mock_patches(mock_fs, mock, check_unix_fs_mocked):
     mock functionality. We parametrize different mock methods to ensure
     all (intended, at least) mock API is covered.
     """
+    mock_fs(mock)
     mocked_rm, mocked_ls = mock_fs(mock)
     check_unix_fs_mocked(mocked_rm, mocked_ls)