Skip to content

Commit 239a332

Browse files
committed
.
1 parent ab577dc commit 239a332

1 file changed

Lines changed: 35 additions & 35 deletions

File tree

tests/test_transport.py

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1+
import asyncio
12
import logging
2-
import pickle
33
import os
4+
import pickle
45
import socket
56
import sys
6-
import asyncio
77
from collections import defaultdict
88
from datetime import datetime, timedelta, timezone
99
from unittest import mock
1010

1111
import pytest
12+
1213
from tests.conftest import CapturingServer
1314

1415
try:
@@ -30,27 +31,26 @@
3031
import sentry_sdk
3132
from sentry_sdk import (
3233
Client,
34+
Hub,
3335
add_breadcrumb,
3436
capture_message,
35-
isolation_scope,
3637
get_isolation_scope,
37-
Hub,
38+
isolation_scope,
3839
)
3940
from sentry_sdk._compat import PY37, PY38
40-
from sentry_sdk.utils import Dsn
41-
from sentry_sdk.envelope import Envelope, Item, parse_json, PayloadRef
41+
from sentry_sdk.envelope import Envelope, Item, PayloadRef, parse_json
42+
from sentry_sdk.integrations.asyncio import AsyncioIntegration
43+
from sentry_sdk.integrations.logging import LoggingIntegration, ignore_logger
4244
from sentry_sdk.transport import (
4345
KEEP_ALIVE_SOCKET_OPTIONS,
44-
EnvelopePrinterTransport,
45-
Transport,
46-
_parse_rate_limits,
4746
AsyncHttpTransport,
4847
HttpTransport,
48+
Transport,
49+
_EnvelopePrinterTransport,
50+
_parse_rate_limits,
4951
make_transport,
5052
)
51-
from sentry_sdk.integrations.logging import LoggingIntegration, ignore_logger
52-
from sentry_sdk.integrations.asyncio import AsyncioIntegration
53-
53+
from sentry_sdk.utils import Dsn
5454

5555
server = None
5656

@@ -1047,7 +1047,7 @@ async def send_message(i):
10471047
await client.close_async(timeout=2.0)
10481048

10491049

1050-
# --- EnvelopePrinterTransport tests ---
1050+
# --- _EnvelopePrinterTransport tests ---
10511051

10521052

10531053
class FakeTransport(Transport):
@@ -1088,10 +1088,10 @@ def _make_binary_envelope():
10881088
return envelope
10891089

10901090

1091-
class TestEnvelopePrinterTransportDelegation:
1091+
class Test_EnvelopePrinterTransportDelegation:
10921092
def test_capture_envelope_delegates(self):
10931093
inner = FakeTransport()
1094-
transport = EnvelopePrinterTransport(inner)
1094+
transport = _EnvelopePrinterTransport(inner)
10951095
envelope = _make_json_envelope()
10961096

10971097
transport.capture_envelope(envelope)
@@ -1100,7 +1100,7 @@ def test_capture_envelope_delegates(self):
11001100

11011101
def test_flush_delegates(self):
11021102
inner = FakeTransport()
1103-
transport = EnvelopePrinterTransport(inner)
1103+
transport = _EnvelopePrinterTransport(inner)
11041104
cb = lambda: None
11051105

11061106
transport.flush(10.0, cb)
@@ -1109,15 +1109,15 @@ def test_flush_delegates(self):
11091109

11101110
def test_kill_delegates(self):
11111111
inner = FakeTransport()
1112-
transport = EnvelopePrinterTransport(inner)
1112+
transport = _EnvelopePrinterTransport(inner)
11131113

11141114
transport.kill()
11151115

11161116
assert inner.killed is True
11171117

11181118
def test_record_lost_event_delegates(self):
11191119
inner = FakeTransport()
1120-
transport = EnvelopePrinterTransport(inner)
1120+
transport = _EnvelopePrinterTransport(inner)
11211121
item = Item(payload='{"x": 1}', type="event")
11221122

11231123
transport.record_lost_event("queue_overflow", "error", item, quantity=5)
@@ -1126,7 +1126,7 @@ def test_record_lost_event_delegates(self):
11261126

11271127
def test_is_healthy_delegates(self):
11281128
inner = FakeTransport()
1129-
transport = EnvelopePrinterTransport(inner)
1129+
transport = _EnvelopePrinterTransport(inner)
11301130

11311131
assert transport.is_healthy() is True
11321132

@@ -1135,7 +1135,7 @@ def test_is_healthy_delegates(self):
11351135

11361136
def test_parsed_dsn_forwarded(self):
11371137
inner = FakeTransport()
1138-
transport = EnvelopePrinterTransport(inner)
1138+
transport = _EnvelopePrinterTransport(inner)
11391139

11401140
assert transport.parsed_dsn is inner.parsed_dsn
11411141

@@ -1151,10 +1151,10 @@ def _collect_debug_log_text(mock_debug):
11511151
return "\n".join(parts)
11521152

11531153

1154-
class TestEnvelopePrinterTransportLogging:
1154+
class Test_EnvelopePrinterTransportLogging:
11551155
def test_json_payload_is_pretty_printed(self):
11561156
inner = FakeTransport()
1157-
transport = EnvelopePrinterTransport(inner)
1157+
transport = _EnvelopePrinterTransport(inner)
11581158
envelope = _make_json_envelope()
11591159

11601160
with mock.patch("sentry_sdk.transport.logger") as mock_logger:
@@ -1165,7 +1165,7 @@ def test_json_payload_is_pretty_printed(self):
11651165

11661166
def test_binary_payload_shows_byte_count(self):
11671167
inner = FakeTransport()
1168-
transport = EnvelopePrinterTransport(inner)
1168+
transport = _EnvelopePrinterTransport(inner)
11691169
envelope = _make_binary_envelope()
11701170

11711171
with mock.patch("sentry_sdk.transport.logger") as mock_logger:
@@ -1176,7 +1176,7 @@ def test_binary_payload_shows_byte_count(self):
11761176

11771177
def test_envelope_headers_are_logged(self):
11781178
inner = FakeTransport()
1179-
transport = EnvelopePrinterTransport(inner)
1179+
transport = _EnvelopePrinterTransport(inner)
11801180
envelope = _make_json_envelope()
11811181

11821182
with mock.patch("sentry_sdk.transport.logger") as mock_logger:
@@ -1187,7 +1187,7 @@ def test_envelope_headers_are_logged(self):
11871187

11881188
def test_item_type_and_headers_are_logged(self):
11891189
inner = FakeTransport()
1190-
transport = EnvelopePrinterTransport(inner)
1190+
transport = _EnvelopePrinterTransport(inner)
11911191
envelope = _make_json_envelope()
11921192

11931193
with mock.patch("sentry_sdk.transport.logger") as mock_logger:
@@ -1200,7 +1200,7 @@ def test_item_type_and_headers_are_logged(self):
12001200

12011201
def test_logging_exception_does_not_propagate(self):
12021202
inner = FakeTransport()
1203-
transport = EnvelopePrinterTransport(inner)
1203+
transport = _EnvelopePrinterTransport(inner)
12041204
envelope = _make_json_envelope()
12051205

12061206
with mock.patch(
@@ -1212,7 +1212,7 @@ def test_logging_exception_does_not_propagate(self):
12121212

12131213
def test_empty_envelope_logs_headers_only(self):
12141214
inner = FakeTransport()
1215-
transport = EnvelopePrinterTransport(inner)
1215+
transport = _EnvelopePrinterTransport(inner)
12161216
envelope = Envelope(headers={"event_id": "empty1"})
12171217

12181218
with mock.patch("sentry_sdk.transport.logger") as mock_logger:
@@ -1225,7 +1225,7 @@ def test_empty_envelope_logs_headers_only(self):
12251225

12261226
def test_multiple_items_each_logged(self):
12271227
inner = FakeTransport()
1228-
transport = EnvelopePrinterTransport(inner)
1228+
transport = _EnvelopePrinterTransport(inner)
12291229
envelope = Envelope(headers={"event_id": "multi"})
12301230
envelope.add_item(Item(payload='{"a": 1}', type="event"))
12311231
envelope.add_item(Item(payload=b"\xff", type="attachment"))
@@ -1259,7 +1259,7 @@ def test_env_var_wraps_transport(self):
12591259
with mock.patch.dict(os.environ, {"SENTRY_PRINT_ENVELOPES": "1"}):
12601260
transport = make_transport(options)
12611261

1262-
assert isinstance(transport, EnvelopePrinterTransport)
1262+
assert isinstance(transport, _EnvelopePrinterTransport)
12631263
assert isinstance(transport._inner, HttpTransport)
12641264

12651265
def test_no_env_var_returns_plain_transport(self):
@@ -1284,7 +1284,7 @@ def test_no_env_var_returns_plain_transport(self):
12841284
transport = make_transport(options)
12851285

12861286
assert isinstance(transport, HttpTransport)
1287-
assert not isinstance(transport, EnvelopePrinterTransport)
1287+
assert not isinstance(transport, _EnvelopePrinterTransport)
12881288

12891289
@pytest.mark.parametrize("value", ["0", "false", "no", ""])
12901290
def test_falsy_env_var_values_do_not_wrap(self, value):
@@ -1308,7 +1308,7 @@ def test_falsy_env_var_values_do_not_wrap(self, value):
13081308
transport = make_transport(options)
13091309

13101310
assert isinstance(transport, HttpTransport)
1311-
assert not isinstance(transport, EnvelopePrinterTransport)
1311+
assert not isinstance(transport, _EnvelopePrinterTransport)
13121312

13131313
def test_env_var_wraps_pre_instantiated_transport(self):
13141314
inner = FakeTransport()
@@ -1331,14 +1331,14 @@ def test_env_var_wraps_pre_instantiated_transport(self):
13311331
with mock.patch.dict(os.environ, {"SENTRY_PRINT_ENVELOPES": "1"}):
13321332
transport = make_transport(options)
13331333

1334-
assert isinstance(transport, EnvelopePrinterTransport)
1334+
assert isinstance(transport, _EnvelopePrinterTransport)
13351335
assert transport._inner is inner
13361336

13371337

1338-
class TestEnvelopePrinterTransportIsinstance:
1338+
class Test_EnvelopePrinterTransportIsinstance:
13391339
def test_isinstance_matches_inner_transport_class(self):
13401340
inner = FakeTransport()
1341-
wrapper = EnvelopePrinterTransport(inner)
1341+
wrapper = _EnvelopePrinterTransport(inner)
13421342

13431343
assert isinstance(wrapper, FakeTransport)
13441344
assert isinstance(wrapper, Transport)
@@ -1368,6 +1368,6 @@ def test_isinstance_matches_http_transport(self):
13681368
def test_getattr_delegates_to_inner(self):
13691369
inner = FakeTransport()
13701370
inner.custom_attr = "test_value"
1371-
wrapper = EnvelopePrinterTransport(inner)
1371+
wrapper = _EnvelopePrinterTransport(inner)
13721372

13731373
assert wrapper.custom_attr == "test_value"

0 commit comments

Comments
 (0)