Merge pull request #70 from cloudblue/mocker_calls_not_cleared_after_previous_tc_fails

Wrap mocker stop within try/finally

Author: ffaraone

connect/client/testing/fluent.py

@@ -146,8 +146,10 @@ def start(self):
         _mocker.start()
 
     def reset(self, success=True):
-        _mocker.stop(allow_assert=success)
-        _mocker.reset()
+        try:
+            _mocker.stop(allow_assert=success)
+        finally:
+            _mocker.reset()
 
     def __enter__(self):
         self.start()

tests/client/test_testing.py

@@ -402,3 +402,15 @@ def test_exclude(mocker, exclude):
 
 def test_get_requests_mocker():
     assert get_requests_mocker() == _mocker
+
+
+def test_mocker_reset(mocker):
+    mocker.patch(
+        'connect.client.testing.fluent._mocker.stop',
+        side_effect=Exception('error'),
+    )
+    mocked_reset = mocker.patch('connect.client.testing.fluent._mocker.reset')
+    mocker = ConnectClientMocker('http://localhost')
+    with pytest.raises(Exception):
+        mocker.reset()
+    mocked_reset.assert_called_once()