From 3deef1a4545a30bacbb3c37fb84c8e7bd1b78578 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Tue, 4 Oct 2016 19:10:32 +1100 Subject: [PATCH] Add called_once to Mocker The called_once function was added to the Matcher and the Adapter but not the top level Mocker function. Change-Id: I4daa839d931b44fa69133ace663d41c84796b4ba Closes-Bug: #1630159 --- requests_mock/mocker.py | 1 + requests_mock/tests/test_mocker.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/requests_mock/mocker.py b/requests_mock/mocker.py index f477eba..bb9e1e5 100644 --- a/requests_mock/mocker.py +++ b/requests_mock/mocker.py @@ -37,6 +37,7 @@ class MockerCore(object): 'add_matcher', 'request_history', 'called', + 'called_once', 'call_count']) case_sensitive = False diff --git a/requests_mock/tests/test_mocker.py b/requests_mock/tests/test_mocker.py index 5a81db9..69e266c 100644 --- a/requests_mock/tests/test_mocker.py +++ b/requests_mock/tests/test_mocker.py @@ -176,6 +176,7 @@ class MockerTests(base.TestCase): self.assertTrue(matcher.called) self.assertTrue(matcher.called_once) self.assertTrue(m.called) + self.assertTrue(m.called_once) self.assertEqual(m.request_history, matcher.request_history) self.assertIs(m.last_request, matcher.last_request) @@ -204,6 +205,8 @@ class MockerHttpMethodsTests(base.TestCase): self.assertResponse(resp) self.assertTrue(mock_obj.called) self.assertTrue(mock_obj.called_once) + self.assertTrue(m.called) + self.assertTrue(m.called_once) @requests_mock.Mocker() def test_mocker_get(self, m): @@ -211,6 +214,8 @@ class MockerHttpMethodsTests(base.TestCase): self.assertResponse(requests.get(self.URL)) self.assertTrue(mock_obj.called) self.assertTrue(mock_obj.called_once) + self.assertTrue(m.called) + self.assertTrue(m.called_once) @requests_mock.Mocker() def test_mocker_options(self, m): @@ -218,6 +223,8 @@ class MockerHttpMethodsTests(base.TestCase): self.assertResponse(requests.options(self.URL)) self.assertTrue(mock_obj.called) self.assertTrue(mock_obj.called_once) + self.assertTrue(m.called) + self.assertTrue(m.called_once) @requests_mock.Mocker() def test_mocker_head(self, m): @@ -225,6 +232,8 @@ class MockerHttpMethodsTests(base.TestCase): self.assertResponse(requests.head(self.URL)) self.assertTrue(mock_obj.called) self.assertTrue(mock_obj.called_once) + self.assertTrue(m.called) + self.assertTrue(m.called_once) @requests_mock.Mocker() def test_mocker_post(self, m): @@ -232,6 +241,8 @@ class MockerHttpMethodsTests(base.TestCase): self.assertResponse(requests.post(self.URL)) self.assertTrue(mock_obj.called) self.assertTrue(mock_obj.called_once) + self.assertTrue(m.called) + self.assertTrue(m.called_once) @requests_mock.Mocker() def test_mocker_put(self, m): @@ -239,6 +250,8 @@ class MockerHttpMethodsTests(base.TestCase): self.assertResponse(requests.put(self.URL)) self.assertTrue(mock_obj.called) self.assertTrue(mock_obj.called_once) + self.assertTrue(m.called) + self.assertTrue(m.called_once) @requests_mock.Mocker() def test_mocker_patch(self, m): @@ -246,6 +259,8 @@ class MockerHttpMethodsTests(base.TestCase): self.assertResponse(requests.patch(self.URL)) self.assertTrue(mock_obj.called) self.assertTrue(mock_obj.called_once) + self.assertTrue(m.called) + self.assertTrue(m.called_once) @requests_mock.Mocker() def test_mocker_delete(self, m): @@ -253,6 +268,8 @@ class MockerHttpMethodsTests(base.TestCase): self.assertResponse(requests.delete(self.URL)) self.assertTrue(mock_obj.called) self.assertTrue(mock_obj.called_once) + self.assertTrue(m.called) + self.assertTrue(m.called_once) @requests_mock.Mocker() def test_mocker_real_http_and_responses(self, m):