Calls info in BaseResponse

responses/__init__.py

@@ -255,6 +255,9 @@ def __getitem__(self, idx: Union[int, slice]) -> Union[Call, List[Call]]:
     def add(self, request: "PreparedRequest", response: _Body) -> None:
         self._calls.append(Call(request, response))
 
+    def add_call(self, call: Call) -> None:
+        self._calls.append(call)
+
     def reset(self) -> None:
         self._calls = []
 
@@ -394,7 +397,7 @@ def __init__(
             )
 
         self.match: "_MatcherIterable" = match
-        self.call_count: int = 0
+        self._calls: CallList = CallList()
         self.passthrough = passthrough
 
     def __eq__(self, other: Any) -> bool:
@@ -503,6 +506,14 @@ def matches(self, request: "PreparedRequest") -> Tuple[bool, str]:
 
         return True, ""
 
+    @property
+    def call_count(self) -> int:
+        return len(self._calls)
+
+    @property
+    def calls(self) -> CallList:
+        return self._calls
+
 
 def _form_response(
     body: Union[BufferedReader, BytesIO],
@@ -1064,14 +1075,16 @@ def _on_request(
                     request, match.get_response(request)
                 )
             except BaseException as response:
-                match.call_count += 1
+                next_index = len(self._calls)
                 self._calls.add(request, response)
+                match.calls.add_call(self._calls[next_index])
                 raise
 
         if resp_callback:
             response = resp_callback(response)  # type: ignore[misc]
-        match.call_count += 1
+        next_index = len(self._calls)
         self._calls.add(request, response)  # type: ignore[misc]
+        match.calls.add_call(self._calls[next_index])
 
         retries = retries or adapter.max_retries
         # first validate that current request is eligible to be retried.

responses/tests/test_responses.py

@@ -1,6 +1,7 @@
 # coding: utf-8
 
 import inspect
+import json
 import os
 import re
 import warnings
@@ -1988,6 +1989,88 @@ def run():
     assert_reset()
 
 
+def test_response_and_requests_mock_calls_are_equal():
+    @responses.activate
+    def run():
+        rsp = responses.add(responses.GET, "http://www.example.com")
+        rsp2 = responses.add(responses.GET, "http://www.example.com/1")
+
+        requests.get("http://www.example.com")
+        requests.get("http://www.example.com/1")
+
+        assert len(responses.calls) == 2
+        assert rsp.call_count == 1
+        assert rsp.calls[0] is responses.calls[0]
+        assert rsp2.call_count == 1
+        assert rsp2.calls[0] is responses.calls[1]
+
+    run()
+    assert_reset()
+
+
+def test_response_call_request():
+    @responses.activate
+    def run():
+        rsp = responses.add(responses.GET, "http://www.example.com")
+        rsp2 = responses.add(
+            responses.PUT, "http://www.foo.bar/42/", json={"id": 42, "name": "Bazz"}
+        )
+
+        requests.get("http://www.example.com")
+        requests.get("http://www.example.com?hello=world")
+        requests.put(
+            "http://www.foo.bar/42/",
+            json={"name": "Bazz"},
+        )
+
+        assert rsp.call_count == 2
+        request = rsp.calls[0].request
+        assert request.url == "http://www.example.com/"
+        assert request.method == "GET"
+        request = rsp.calls[1].request
+        assert request.url == "http://www.example.com/?hello=world"
+        assert request.method == "GET"
+        assert rsp2.call_count == 1
+        request = rsp2.calls[0].request
+        assert request.url == "http://www.foo.bar/42/"
+        assert request.method == "PUT"
+        request_payload = json.loads(request.body)
+        assert request_payload == {"name": "Bazz"}
+
+    run()
+    assert_reset()
+
+
+def test_response_call_response():
+    @responses.activate
+    def run():
+        rsp = responses.add(responses.GET, "http://www.example.com", body=b"test")
+        rsp2 = responses.add(
+            responses.POST,
+            "http://www.foo.bar/42/",
+            json={"id": 42, "name": "Bazz"},
+            status=201,
+        )
+
+        requests.get("http://www.example.com")
+        requests.post(
+            "http://www.foo.bar/42/",
+            json={"name": "Bazz"},
+        )
+
+        assert rsp.call_count == 1
+        response = rsp.calls[0].response
+        assert response.content == b"test"
+        assert response.status_code == 200
+        assert rsp2.call_count == 1
+        response = rsp2.calls[0].response
+        assert response.json() == {"id": 42, "name": "Bazz"}
+        assert response.status_code == 201
+
+    run()
+    assert_reset()
+
+
 def test_fail_request_error():
     """
     Validate that exception is raised if request URL/Method/kwargs don't match