httpdbg 0.31.4__tar.gz → 0.31.6__tar.gz

{httpdbg-0.31.4 → httpdbg-0.31.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: httpdbg
-Version: 0.31.4
+Version: 0.31.6
 Summary: A very simple tool to debug HTTP(S) client requests
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0

{httpdbg-0.31.4 → httpdbg-0.31.6}/httpdbg/__init__.py

@@ -3,6 +3,6 @@ from httpdbg.hooks.all import httprecord
 from httpdbg.records import HTTPRecords
 
 
-__version__ = "0.31.4"
+__version__ = "0.31.6"
 
 __all__ = ["httprecord", "HTTPRecords"]

{httpdbg-0.31.4 → httpdbg-0.31.6}/httpdbg/hooks/aiohttp.py

@@ -25,10 +25,11 @@ def set_hook_for_aiohttp_async(records: HTTPRecords, method: Callable):
 
             if "str_or_url" in callargs:
                 if initiator_and_group:
-                    initiator, group = initiator_and_group
-                    records.add_new_record_exception(
-                        initiator, group, str(callargs["str_or_url"]), ex
-                    )
+                    initiator, group, is_new = initiator_and_group
+                    if is_new:
+                        records.add_new_record_exception(
+                            initiator, group, str(callargs["str_or_url"]), ex
+                        )
             raise
 
     return hook

{httpdbg-0.31.4 → httpdbg-0.31.6}/httpdbg/hooks/httpx.py

@@ -25,10 +25,11 @@ def set_hook_for_httpx_async(records: HTTPRecords, method: Callable):
 
             if "url" in callargs:
                 if initiator_and_group:
-                    initiator, group = initiator_and_group
-                    records.add_new_record_exception(
-                        initiator, group, str(callargs["url"]), ex
-                    )
+                    initiator, group, is_new = initiator_and_group
+                    if is_new:
+                        records.add_new_record_exception(
+                            initiator, group, str(callargs["url"]), ex
+                        )
             raise
 
     return hook
@@ -48,10 +49,11 @@ def set_hook_for_httpx(records: HTTPRecords, method: Callable):
 
             if "url" in callargs:
                 if initiator_and_group:
-                    initiator, group = initiator_and_group
-                    records.add_new_record_exception(
-                        initiator, group, str(callargs["url"]), ex
-                    )
+                    initiator, group, is_new = initiator_and_group
+                    if is_new:
+                        records.add_new_record_exception(
+                            initiator, group, str(callargs["url"]), ex
+                        )
             raise
 
     return hook

{httpdbg-0.31.4 → httpdbg-0.31.6}/httpdbg/hooks/requests.py

@@ -25,10 +25,11 @@ def set_hook_for_requests(records: HTTPRecords, method: Callable):
 
             if "url" in callargs:
                 if initiator_and_group:
-                    initiator, group = initiator_and_group
-                    records.add_new_record_exception(
-                        initiator, group, str(callargs["url"]), ex
-                    )
+                    initiator, group, is_new = initiator_and_group
+                    if is_new:
+                        records.add_new_record_exception(
+                            initiator, group, str(callargs["url"]), ex
+                        )
             raise
 
     return hook

{httpdbg-0.31.4 → httpdbg-0.31.6}/httpdbg/hooks/socket.py

@@ -3,15 +3,18 @@ import asyncio
 import asyncio.proactor_events
 from collections.abc import Callable
 from contextlib import contextmanager
+import datetime
 import platform
 import socket
 import ssl
 import sys
+import traceback
 from typing import Generator
 
 from httpdbg.hooks.utils import getcallargs
 from httpdbg.hooks.utils import decorate
 from httpdbg.hooks.utils import undecorate
+from httpdbg.initiator import httpdbg_initiator
 from httpdbg.records import HTTPRecord
 from httpdbg.records import HTTPRecords
 from httpdbg.log import logger
@@ -33,20 +36,29 @@ def set_hook_for_socket_init(records: HTTPRecords, method: Callable):
 # what: A connection to a remote socket is initiated.
 # action: A new entry is added to the temporary raw socket storage list.
 def set_hook_for_socket_connect(records: HTTPRecords, method: Callable):
-    def hook(self, address):
+    def hook(self, *args, **kwargs):
+        tbegin: datetime.datetime = datetime.datetime.now(datetime.timezone.utc)
         socketdata = records.get_socket_data(self, force_new=True)
         if socketdata:
             logger().info(
-                f"CONNECT - self={self} id={id(self)} socketdata={socketdata} address={address}"
+                f"CONNECT - self={self} id={id(self)} socketdata={socketdata} args={args} kwargs={kwargs}"
             )
         try:
-            r = method(self, address)
+            r = method(self, *args, **kwargs)
         except Exception as ex:
             if not isinstance(
                 ex, (BlockingIOError, OSError)
             ):  # BlockingIOError for async, OSError for ipv6
-                initiator = records.get_initiator()
-                records.add_new_record_exception(initiator, "", ex)
+                with httpdbg_initiator(
+                    records, traceback.extract_stack(), method, *args, **kwargs
+                ) as initiator_and_group:
+                    initiator, group, is_new = initiator_and_group
+                    if is_new:
+                        initiator.tbegin = tbegin
+                        group.tbegin = tbegin
+                        records.add_new_record_exception(
+                            initiator, group, "http:///", ex
+                        )
             raise
 
         return r
@@ -60,11 +72,18 @@ def set_hook_for_socket_connect(records: HTTPRecords, method: Callable):
 # action: Link the socket and the sslsocket
 def set_hook_for_ssl_wrap_socket(records: HTTPRecords, method: Callable):
     def hook(sock, *args, **kwargs):
+        tbegin: datetime.datetime = datetime.datetime.now(datetime.timezone.utc)
         try:
             sslsocket = method(sock, *args, **kwargs)
         except Exception as ex:
-            initiator = records.get_initiator()
-            records.add_new_record_exception(initiator, "", ex)
+            with httpdbg_initiator(
+                records, traceback.extract_stack(), method, *args, **kwargs
+            ) as initiator_and_group:
+                initiator, group, is_new = initiator_and_group
+                if is_new:
+                    initiator.tbegin = tbegin
+                    group.tbegin = tbegin
+                    records.add_new_record_exception(initiator, group, "http:///", ex)
             raise
 
         logger().info(
@@ -85,11 +104,18 @@ def set_hook_for_ssl_wrap_socket(records: HTTPRecords, method: Callable):
 # action: Link the socket and the sslsocket
 def set_hook_for_sslcontext_wrap_socket(records: HTTPRecords, method: Callable):
     def hook(self, sock, *args, **kwargs):
+        tbegin: datetime.datetime = datetime.datetime.now(datetime.timezone.utc)
         try:
             sslsocket = method(self, sock, *args, **kwargs)
         except Exception as ex:
-            initiator = records.get_initiator()
-            records.add_new_record_exception(initiator, "", ex)
+            with httpdbg_initiator(
+                records, traceback.extract_stack(), method, *args, **kwargs
+            ) as initiator_and_group:
+                initiator, group, is_new = initiator_and_group
+                if is_new:
+                    initiator.tbegin = tbegin
+                    group.tbegin = tbegin
+                    records.add_new_record_exception(initiator, group, "http:///", ex)
             raise
 
         logger().info(
@@ -110,11 +136,18 @@ def set_hook_for_sslcontext_wrap_socket(records: HTTPRecords, method: Callable):
 # action: Record a new SocketRawData if necessary
 def set_hook_for_socket_wrap_bio(records: HTTPRecords, method: Callable):
     def hook(self, *args, **kwargs):
+        tbegin: datetime.datetime = datetime.datetime.now(datetime.timezone.utc)
         try:
             sslobject = method(self, *args, **kwargs)
         except Exception as ex:
-            initiator = records.get_initiator()
-            records.add_new_record_exception(initiator, "", ex)
+            with httpdbg_initiator(
+                records, traceback.extract_stack(), method, *args, **kwargs
+            ) as initiator_and_group:
+                initiator, group, is_new = initiator_and_group
+                if is_new:
+                    initiator.tbegin = tbegin
+                    group.tbegin = tbegin
+                    records.add_new_record_exception(initiator, group, "http:///", ex)
             raise
 
         logger().info(
@@ -196,7 +229,6 @@ def set_hook_for_socket_sendall(records: HTTPRecords, method: Callable):
             logger().info(
                 f"SENDALL - self={self} id={id(self)} socketdata={socketdata} bytes={(b''+bytes)[:20]} type={type(bytes)} len={len(bytes)} args={args} kwargs={kwargs}"
             )
-
         if socketdata:
             if socketdata.record:
                 socketdata.record.request.rawdata += bytes
@@ -205,15 +237,23 @@ def set_hook_for_socket_sendall(records: HTTPRecords, method: Callable):
                 http_detected = socketdata.http_detected()
                 if http_detected:
                     logger().info("SENDALL - http detected")
-                    socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
-                    socketdata.record.initiator_id = records.get_initiator()
-                    socketdata.record.address = socketdata.address
-                    socketdata.record.ssl = socketdata.ssl
-                    socketdata.record.request.rawdata = socketdata.rawdata
-                    records.requests[socketdata.record.id] = socketdata.record
+                    with httpdbg_initiator(
+                        records, traceback.extract_stack(), method, *args, **kwargs
+                    ) as initiator_and_group:
+                        initiator, group, is_new = initiator_and_group
+                        if is_new:
+                            tbegin = socketdata.tbegin - datetime.timedelta(
+                                milliseconds=1
+                            )
+                            initiator.tbegin = tbegin
+                            group.tbegin = tbegin
+                        socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
+                        socketdata.record.address = socketdata.address
+                        socketdata.record.ssl = socketdata.ssl
+                        socketdata.record.request.rawdata = socketdata.rawdata
+                        records.requests[socketdata.record.id] = socketdata.record
                 elif http_detected is False:  # if None, there is nothing to do
                     records._sockets[id(self)] = None
-
         try:
             return method(self, bytes, *args, **kwargs)
         except Exception as ex:
@@ -250,12 +290,21 @@ def set_hook_for_socket_send(records: HTTPRecords, method: Callable):
                 socketdata.rawdata += bytes[:size]
                 http_detected = socketdata.http_detected()
                 if http_detected:
-                    socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
-                    socketdata.record.initiator_id = records.get_initiator()
-                    socketdata.record.address = socketdata.address
-                    socketdata.record.ssl = socketdata.ssl
-                    socketdata.record.request.rawdata = socketdata.rawdata
-                    records.requests[socketdata.record.id] = socketdata.record
+                    with httpdbg_initiator(
+                        records, traceback.extract_stack(), method, *args, **kwargs
+                    ) as initiator_and_group:
+                        initiator, group, is_new = initiator_and_group
+                        if is_new:
+                            tbegin = socketdata.tbegin - datetime.timedelta(
+                                milliseconds=1
+                            )
+                            initiator.tbegin = tbegin
+                            group.tbegin = tbegin
+                        socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
+                        socketdata.record.address = socketdata.address
+                        socketdata.record.ssl = socketdata.ssl
+                        socketdata.record.request.rawdata = socketdata.rawdata
+                        records.requests[socketdata.record.id] = socketdata.record
                 elif http_detected is False:  # if None, there is nothing to do
                     records._sockets[id(self)] = None
         return size
@@ -314,12 +363,21 @@ def set_hook_for_sslobject_write(records: HTTPRecords, method: Callable):
                 socketdata.rawdata += bytes(buf[:size])
                 http_detected = socketdata.http_detected()
                 if http_detected:
-                    socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
-                    socketdata.record.initiator_id = records.get_initiator()
-                    socketdata.record.address = socketdata.address
-                    socketdata.record.ssl = socketdata.ssl
-                    socketdata.record.request.rawdata = socketdata.rawdata
-                    records.requests[socketdata.record.id] = socketdata.record
+                    with httpdbg_initiator(
+                        records, traceback.extract_stack(), method, *args, **kwargs
+                    ) as initiator_and_group:
+                        initiator, group, is_new = initiator_and_group
+                        if is_new:
+                            tbegin = socketdata.tbegin - datetime.timedelta(
+                                milliseconds=1
+                            )
+                            initiator.tbegin = tbegin
+                            group.tbegin = tbegin
+                        socketdata.record = HTTPRecord(tbegin=socketdata.tbegin)
+                        socketdata.record.address = socketdata.address
+                        socketdata.record.ssl = socketdata.ssl
+                        socketdata.record.request.rawdata = socketdata.rawdata
+                        records.requests[socketdata.record.id] = socketdata.record
                 elif http_detected is False:  # if None, there is nothing to do
                     records.sockets[id(self)] = None
         return size
@@ -376,8 +434,8 @@ def hook_socket(records: HTTPRecords) -> Generator[None, None, None]:
     socket.socket.send = decorate(records, socket.socket.send, set_hook_for_socket_send)
 
     if (sys.version_info.major == 3) and (sys.version_info.minor < 12):
-        ssl.wrap_socket = decorate(
-            records, ssl.wrap_socket, set_hook_for_ssl_wrap_socket
+        ssl.wrap_socket = decorate(  # type: ignore[attr-defined]
+            records, ssl.wrap_socket, set_hook_for_ssl_wrap_socket  # type: ignore[attr-defined]
         )
 
     ssl.SSLContext.wrap_socket = decorate(
@@ -436,7 +494,7 @@ def hook_socket(records: HTTPRecords) -> Generator[None, None, None]:
     socket.socket.send = undecorate(socket.socket.send)
 
     if (sys.version_info.major == 3) and (sys.version_info.minor < 12):
-        ssl.wrap_socket = undecorate(ssl.wrap_socket)
+        ssl.wrap_socket = undecorate(ssl.wrap_socket)  # type: ignore[attr-defined]
 
     ssl.SSLContext.wrap_socket = undecorate(ssl.SSLContext.wrap_socket)
     ssl.SSLContext.wrap_bio = undecorate(ssl.SSLContext.wrap_bio)

{httpdbg-0.31.4 → httpdbg-0.31.6}/httpdbg/hooks/urllib3.py

@@ -25,10 +25,11 @@ def set_hook_for_urllib3(records: HTTPRecords, method: Callable):
 
             if "url" in callargs:
                 if initiator_and_group:
-                    initiator, group = initiator_and_group
-                    records.add_new_record_exception(
-                        initiator, group, str(callargs["url"]), ex
-                    )
+                    initiator, group, is_new = initiator_and_group
+                    if is_new:
+                        records.add_new_record_exception(
+                            initiator, group, str(callargs["url"]), ex
+                        )
             raise
 
     return hook

{httpdbg-0.31.4 → httpdbg-0.31.6}/httpdbg/initiator.py

@@ -112,7 +112,9 @@ def get_current_instruction(
             n_stack -= 1
             framesummary = extracted_stack[n_stack - 1]
 
-        while "httpdbg/hooks" in framesummary.filename:
+        while ("httpdbg/hooks" in framesummary.filename) or (
+            "httpdbg\\hooks" in framesummary.filename
+        ):
             n_stack -= 1
             framesummary = extracted_stack[n_stack - 1]
 
@@ -209,44 +211,73 @@ def httpdbg_initiator(
     original_method: Callable,
     *args,
     **kwargs,
-) -> Generator[Union[Tuple[Initiator, Group], None], None, None]:
-    envname = f"{HTTPDBG_CURRENT_INITIATOR}_{records.session.id}"
-
-    if not os.environ.get(envname):
-        # temporary set a fake initiator env variable to avoid a recursion error
-        #  RecursionError: maximum recursion depth exceeded while calling a Python object
-        # TL;DR When we construct the short_stack string, a recursion error occurs if there
-        # is an object from a class where a hooked method is called in __repr__ or __str__.
-        os.environ[envname] = "blabla"
-
-        callargs = getcallargs(original_method, *args, **kwargs)
-        instruction, short_stack, stack = get_current_instruction(extracted_stack)
+) -> Generator[Union[Tuple[Initiator, Group, bool], None], None, None]:
+    # An initiator is considered set if the environment variable exists and the initiator
+    # is recorded.If the environment variable exists but the initiatir is not recorded,
+    # it means httpdbg was called reentrantly, and we need to record the initiator again
+    # using the same id.
+    initiator_already_set = (HTTPDBG_CURRENT_INITIATOR in os.environ) and (
+        os.environ[HTTPDBG_CURRENT_INITIATOR] in records.initiators
+    )
+    try:
+        if not initiator_already_set:
+            original_initiator_id = None
+            if HTTPDBG_CURRENT_INITIATOR not in os.environ:
+                # temporary set a fake initiator env variable to avoid a recursion error
+                #  RecursionError: maximum recursion depth exceeded while calling a Python object
+                # TL;DR When we construct the short_stack string, a recursion error occurs if there
+                # is an object from a class where a hooked method is called in __repr__ or __str__.
+                os.environ[HTTPDBG_CURRENT_INITIATOR] = "blabla"
+            else:
+                original_initiator_id = os.environ[HTTPDBG_CURRENT_INITIATOR]
+
+            # in any case, we create an Initiator
+
+            callargs = getcallargs(original_method, *args, **kwargs)
+            instruction, short_stack, stack = get_current_instruction(extracted_stack)
+
+            str_module = (
+                f"{original_method.__module__}."
+                if hasattr(original_method, "__module__")
+                else ""
+            )
+            str_name = (
+                f"{original_method.__name__}"
+                if hasattr(original_method, "__name__")
+                else "***"
+            )
+            short_stack += f"----------\n{str_module}{str_name}(\n"
+            for k, v in callargs.items():
+                short_stack += f"    {k}={v}\n"
+            short_stack += ")"
 
-        short_stack += (
-            f"----------\n{original_method.__module__}.{original_method.__name__}(\n"
-        )
-        for k, v in callargs.items():
-            short_stack += f"    {k}={v}\n"
-        short_stack += ")"
+            current_initiator = Initiator(instruction, short_stack, stack)
 
-        current_initiator = Initiator(instruction, short_stack, stack)
-        records.initiators[current_initiator.id] = current_initiator
+            if original_initiator_id:
+                # if we already have an initiator id (reentrant call) we change the initiator id
+                # to keep the same
+                current_initiator.id = original_initiator_id
 
-        os.environ[envname] = current_initiator.id
+            records.initiators[current_initiator.id] = current_initiator
 
-        try:
-            with httpdbg_group(
-                records, instruction, short_stack
-            ) as group:  # by default we group the requests by initiator
-                yield current_initiator, group
-        except Exception:
-            del os.environ[envname]
-            raise
+            os.environ[HTTPDBG_CURRENT_INITIATOR] = current_initiator.id
 
-        del os.environ[envname]
+        else:
+            current_initiator = records.initiators[
+                os.environ[HTTPDBG_CURRENT_INITIATOR]
+            ]
+
+        with httpdbg_group(
+            records, current_initiator.label, current_initiator.short_stack
+        ) as group:  # by default we group the requests by initiator
+            yield current_initiator, group, initiator_already_set is False
+    except Exception:
+        if (not initiator_already_set) and (HTTPDBG_CURRENT_INITIATOR in os.environ):
+            del os.environ[HTTPDBG_CURRENT_INITIATOR]
+        raise
 
-    else:
-        yield None
+    if (not initiator_already_set) and (HTTPDBG_CURRENT_INITIATOR in os.environ):
+        del os.environ[HTTPDBG_CURRENT_INITIATOR]
 
 
 @contextmanager

{httpdbg-0.31.4 → httpdbg-0.31.6}/httpdbg/records.py

@@ -6,7 +6,6 @@ import os
 import socket
 import ssl
 import sys
-import traceback
 from urllib.parse import urlparse
 from typing import Dict, List, Tuple, Union
 
@@ -15,7 +14,6 @@ from httpdbg.env import HTTPDBG_CURRENT_INITIATOR
 from httpdbg.env import HTTPDBG_CURRENT_TAG
 from httpdbg.utils import HTTPDBGCookie
 from httpdbg.utils import HTTPDBGHeader
-from httpdbg.initiator import in_lib
 from httpdbg.initiator import Group
 from httpdbg.initiator import Initiator
 from httpdbg.preview import generate_preview
@@ -217,7 +215,9 @@ class HTTPRecord:
         self.id = get_new_uuid()
         self.address: Tuple[str, int] = ("", 0)
         self._url: Union[str, None] = None
-        self.initiator_id: Union[str, None] = None
+        self.initiator_id: Union[str, None] = os.environ.get(
+            f"{HTTPDBG_CURRENT_INITIATOR}"
+        )
         self.exception: Union[Exception, None] = None
         self.request: HTTPRecordRequest = HTTPRecordRequest()
         self.response: HTTPRecordResponse = HTTPRecordResponse()
@@ -325,27 +325,6 @@ class HTTPRecords:
     def __len__(self) -> int:
         return len(self.requests)
 
-    def get_initiator(self) -> str:
-        envname = f"{HTTPDBG_CURRENT_INITIATOR}_{self.session.id}"
-
-        if envname in os.environ:
-            initiator = self.initiators[os.environ[envname]]
-        else:
-            fullstack = traceback.format_stack()
-            stack: List[str] = []
-            for line in fullstack[6:]:
-                if in_lib(line):
-                    break
-                stack.append(line)
-            long_label = stack[-1]
-            label = long_label.split("\n")[1]
-            initiator = Initiator(label, long_label, stack)
-
-        if initiator.id not in self.initiators:
-            self.initiators[initiator.id] = initiator
-
-        return initiator.id
-
     def get_socket_data(
         self, obj, extra_sock=None, force_new=False, request=None
     ) -> Union[SocketRawData, None]:

{httpdbg-0.31.4 → httpdbg-0.31.6}/httpdbg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: httpdbg
-Version: 0.31.4
+Version: 0.31.6
 Summary: A very simple tool to debug HTTP(S) client requests
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0

httpdbg-0.31.6/tests/test_context_manager.py

@@ -0,0 +1,164 @@
+# -*- coding: utf-8 -*-
+from httpdbg import httprecord
+
+import pytest
+import requests
+
+
+@pytest.mark.cm
+@pytest.mark.api
+def test_context_manager(httpbin):
+    requests.get(httpbin.url + "/get")
+
+    with httprecord() as records:
+        requests.get(httpbin.url + "/get")
+
+    assert len(records.requests) == 1
+
+
+@pytest.mark.cm
+@pytest.mark.api
+def test_context_manager_two_calls(httpbin):
+    requests.get(httpbin.url + "/get")
+
+    with httprecord() as records:
+        requests.get(httpbin.url + "/get")
+
+    assert len(records.requests) == 1
+    for _, req in records.requests.items():
+        assert req.method.lower() == "get"
+
+    with httprecord() as records2:
+        requests.post(httpbin.url + "/post")
+
+    assert len(records2.requests) == 1
+    for _, req in records2.requests.items():
+        assert req.method.lower() == "post"
+
+
+@pytest.mark.cm
+def test_context_manager_reentrant(httpbin):
+    requests.get(httpbin.url + "/get")
+
+    with httprecord() as records1:
+        requests.get(httpbin.url + "/get/a1")
+        with httprecord() as records2:
+            requests.get(httpbin.url + "/get/b1")
+            requests.get(httpbin.url + "/get/b2")
+            with httprecord() as records3:
+                requests.get(httpbin.url + "/get/c1")
+        requests.get(httpbin.url + "/get/a2")
+
+    requests.get(httpbin.url + "/get")
+
+    assert len(records1.requests) == 5
+    assert len(records2.requests) == 3
+    assert len(records3.requests) == 1
+
+
+@pytest.mark.cm
+@pytest.mark.initiator
+def test_context_manager_reentrant_initiator(httpbin):
+    requests.get(httpbin.url + "/get")
+
+    with httprecord() as records1:
+        requests.get(httpbin.url + "/get/a1")
+        with httprecord() as records2:
+            requests.get(httpbin.url + "/get/b1")
+            requests.get(httpbin.url + "/get/b2")
+            with httprecord() as records3:
+                requests.get(httpbin.url + "/get/c1")
+        requests.get(httpbin.url + "/get/a2")
+
+    requests.get(httpbin.url + "/get")
+
+    assert (
+        records1.initiators[records1[0].initiator_id].label
+        == 'requests.get(httpbin.url + "/get/a1")'
+    )
+    assert (
+        records1.initiators[records1[1].initiator_id].label
+        == 'requests.get(httpbin.url + "/get/b1")'
+    )
+    assert (
+        records1.initiators[records1[2].initiator_id].label
+        == 'requests.get(httpbin.url + "/get/b2")'
+    )
+    assert (
+        records1.initiators[records1[3].initiator_id].label
+        == 'requests.get(httpbin.url + "/get/c1")'
+    )
+    assert (
+        records1.initiators[records1[4].initiator_id].label
+        == 'requests.get(httpbin.url + "/get/a2")'
+    )
+    assert (
+        records2.initiators[records2[0].initiator_id].label
+        == 'requests.get(httpbin.url + "/get/b1")'
+    )
+    assert (
+        records2.initiators[records2[1].initiator_id].label
+        == 'requests.get(httpbin.url + "/get/b2")'
+    )
+    assert (
+        records2.initiators[records2[2].initiator_id].label
+        == 'requests.get(httpbin.url + "/get/c1")'
+    )
+    assert (
+        records3.initiators[records3[0].initiator_id].label
+        == 'requests.get(httpbin.url + "/get/c1")'
+    )
+
+
+@pytest.mark.cm
+@pytest.mark.group
+def test_context_manager_reentrant_group(httpbin):
+    requests.get(httpbin.url + "/get")
+
+    with httprecord() as records1:
+        requests.get(httpbin.url + "/get/a1")
+        with httprecord() as records2:
+            requests.get(httpbin.url + "/get/b1")
+            requests.get(httpbin.url + "/get/b2")
+            with httprecord() as records3:
+                requests.get(httpbin.url + "/get/c1")
+        requests.get(httpbin.url + "/get/a2")
+
+    requests.get(httpbin.url + "/get")
+
+    assert (
+        records1.groups[records1[0].group_id].label
+        == 'requests.get(httpbin.url + "/get/a1")'
+    )
+    assert (
+        records1.groups[records1[1].group_id].label
+        == 'requests.get(httpbin.url + "/get/b1")'
+    )
+    assert (
+        records1.groups[records1[2].group_id].label
+        == 'requests.get(httpbin.url + "/get/b2")'
+    )
+    assert (
+        records1.groups[records1[3].group_id].label
+        == 'requests.get(httpbin.url + "/get/c1")'
+    )
+    assert (
+        records1.groups[records1[4].group_id].label
+        == 'requests.get(httpbin.url + "/get/a2")'
+    )
+    assert (
+        records2.groups[records2[0].group_id].label
+        == 'requests.get(httpbin.url + "/get/b1")'
+    )
+    assert (
+        records2.groups[records2[1].group_id].label
+        == 'requests.get(httpbin.url + "/get/b2")'
+    )
+    assert (
+        records2.groups[records2[2].group_id].label
+        == 'requests.get(httpbin.url + "/get/c1")'
+    )
+    assert (
+        records3.groups[records3[0].group_id].label
+        == 'requests.get(httpbin.url + "/get/c1")'
+    )

httpdbg-0.31.4/tests/test_context_manager.py

@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-from httpdbg import httprecord
-
-import pytest
-import requests
-
-
-@pytest.mark.cm
-@pytest.mark.api
-def test_context_manager(httpbin):
-    requests.get(httpbin.url + "/get")
-
-    with httprecord() as records:
-        requests.get(httpbin.url + "/get")
-
-    assert len(records.requests) == 1
-
-
-@pytest.mark.cm
-@pytest.mark.api
-def test_context_manager_two_calls(httpbin):
-    requests.get(httpbin.url + "/get")
-
-    with httprecord() as records:
-        requests.get(httpbin.url + "/get")
-
-    assert len(records.requests) == 1
-    for _, req in records.requests.items():
-        assert req.method.lower() == "get"
-
-    with httprecord() as records2:
-        requests.post(httpbin.url + "/post")
-
-    assert len(records2.requests) == 1
-    for _, req in records2.requests.items():
-        assert req.method.lower() == "post"
-
-
-@pytest.mark.cm
-def test_context_manager_reentrant(httpbin):
-    requests.get(httpbin.url + "/get")
-
-    with httprecord() as records1:
-        requests.get(httpbin.url + "/get/a1")
-        with httprecord() as records2:
-            requests.get(httpbin.url + "/get/b1")
-            requests.get(httpbin.url + "/get/b2")
-            with httprecord() as records3:
-                requests.get(httpbin.url + "/get/c1")
-        requests.get(httpbin.url + "/get/a2")
-
-    requests.get(httpbin.url + "/get")
-
-    assert len(records1.requests) == 5
-    assert len(records2.requests) == 3
-    assert len(records3.requests) == 1