chore: Use top-level flush API in tests (#7725) · intertermux-code/sentry-python@1bef565 · GitHub
Skip to content

Commit 1bef565

Browse files
sentrivanasentrivana
authored
chore: Use top-level flush API in tests (getsentry#7725)
`sentry_sdk.get_client().flush()` -> `sentry_sdk.flush()`
1 parent 38a946b commit 1bef565

11 files changed

Lines changed: 95 additions & 95 deletions

File tree

‎tests/integrations/flask/test_flask.py‎

Lines changed: 3 additions & 3 deletions

‎tests/integrations/graphene/test_graphene.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ def graphql_server_sync():
458458
client = sync_app.test_client()
459459
client.post("/graphql", json=query)
460460

461-
sentry_sdk.get_client().flush()
461+
sentry_sdk.flush()
462462

463463
spans = [item.payload for item in items]
464464
assert len(spans) == 2
@@ -518,7 +518,7 @@ def graphql_server_sync():
518518
client = sync_app.test_client()
519519
client.post("/graphql", json=query)
520520

521-
sentry_sdk.get_client().flush()
521+
sentry_sdk.flush()
522522

523523
spans = [item.payload for item in items]
524524
assert len(spans) == 2
@@ -612,7 +612,7 @@ def graphql_server_sync():
612612
client = sync_app.test_client()
613613
client.post("/graphql", json=query)
614614

615-
sentry_sdk.get_client().flush()
615+
sentry_sdk.flush()
616616

617617
events = [item.payload for item in items if item.type == "event"]
618618
assert len(events) == 1

‎tests/integrations/huey/test_huey.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def division(a, b):
9393
execute_huey_task(
9494
huey, division, 1, int(not task_fails), exceptions=(DivisionByZero,)
9595
)
96-
sentry_sdk.get_client().flush()
96+
sentry_sdk.flush()
9797

9898
payloads = [i.payload for i in items]
9999
# The task is enqueued without a wrapping span, so in streaming mode no
@@ -156,7 +156,7 @@ def retry_task(context):
156156
if has_span_streaming:
157157
items = capture_items("span")
158158
execute_huey_task(huey, retry_task, context)
159-
sentry_sdk.get_client().flush()
159+
sentry_sdk.flush()
160160

161161
payloads = [i.payload for i in items]
162162
# The initial enqueue happens without a wrapping span, so no producer
@@ -179,7 +179,7 @@ def retry_task(context):
179179
task = huey.dequeue()
180180
huey.execute(task)
181181

182-
sentry_sdk.get_client().flush()
182+
sentry_sdk.flush()
183183

184184
all_payloads = [i.payload for i in items]
185185

@@ -223,7 +223,7 @@ def cancel_task():
223223
if has_span_streaming:
224224
items = capture_items("span")
225225
execute_huey_task(huey, cancel_task)
226-
sentry_sdk.get_client().flush()
226+
sentry_sdk.flush()
227227

228228
payloads = [i.payload for i in items]
229229
# Enqueued without a wrapping span -> no producer span in streaming mode.
@@ -269,7 +269,7 @@ def maybe_locked_task():
269269
with huey.lock_task(lock_name):
270270
assert huey.is_locked(task_lock_name) == should_be_locked
271271
execute_huey_task(huey, maybe_locked_task)
272-
sentry_sdk.get_client().flush()
272+
sentry_sdk.flush()
273273

274274
payloads = [i.payload for i in items]
275275
# Enqueued without a wrapping span -> no producer span in streaming mode.
@@ -325,7 +325,7 @@ def division(a, b):
325325
if has_span_streaming:
326326
items = capture_items("event")
327327
execute_huey_task(huey, division, 1, b=0, exceptions=(DivisionByZero,))
328-
sentry_sdk.get_client().flush()
328+
sentry_sdk.flush()
329329
events = [item.payload for item in items]
330330
else:
331331
events = capture_events()
@@ -443,7 +443,7 @@ def task2():
443443
task = huey.dequeue()
444444
huey.execute(task)
445445

446-
sentry_sdk.get_client().flush()
446+
sentry_sdk.flush()
447447
assert len(items) == 6
448448

449449
(
@@ -575,7 +575,7 @@ def task2(results):
575575
task = huey.dequeue()
576576
huey.execute(task)
577577

578-
sentry_sdk.get_client().flush()
578+
sentry_sdk.flush()
579579
assert len(items) == 6
580580

581581
(

‎tests/integrations/loguru/test_loguru.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def test_sentry_logs_warning(
145145

146146
logger.warning("this is {} a {}", "just", "template")
147147

148-
sentry_sdk.get_client().flush()
148+
sentry_sdk.flush()
149149
logs = [item.payload for item in items]
150150

151151
attrs = logs[0]["attributes"]
@@ -168,7 +168,7 @@ def test_sentry_logs_debug(
168168
envelopes = capture_envelopes()
169169

170170
logger.debug("this is %s a template %s", "1", "2")
171-
sentry_sdk.get_client().flush()
171+
sentry_sdk.flush()
172172

173173
assert len(envelopes) == 0
174174

@@ -194,7 +194,7 @@ def test_sentry_log_levels(sentry_init, capture_items, uninstall_integration, re
194194
logger.error("this is a log")
195195
logger.critical("this is a log")
196196

197-
sentry_sdk.get_client().flush()
197+
sentry_sdk.flush()
198198
logs = [item.payload for item in items]
199199
assert len(logs) == 4
200200

@@ -229,7 +229,7 @@ def test_disable_loguru_logs(
229229
logger.error("this is a log")
230230
logger.critical("this is a log")
231231

232-
sentry_sdk.get_client().flush()
232+
sentry_sdk.flush()
233233
logs = [item.payload for item in items]
234234
assert len(logs) == 0
235235

@@ -251,7 +251,7 @@ def test_disable_sentry_logs_by_default(
251251
logger.error("this is a log")
252252
logger.critical("this is a log")
253253

254-
sentry_sdk.get_client().flush()
254+
sentry_sdk.flush()
255255
logs = [item.payload for item in items]
256256
assert len(logs) == 0
257257

@@ -274,7 +274,7 @@ def test_enable_sentry_logs_if_enable_logs_is_true(
274274
logger.error("this is a log")
275275
logger.critical("this is a log")
276276

277-
sentry_sdk.get_client().flush()
277+
sentry_sdk.flush()
278278
logs = [item.payload for item in items]
279279
assert len(logs) == 5
280280

@@ -299,7 +299,7 @@ def test_disable_sentry_logs_if_enable_logs_is_true_but_integration_option_is_fa
299299
logger.error("this is a log")
300300
logger.critical("this is a log")
301301

302-
sentry_sdk.get_client().flush()
302+
sentry_sdk.flush()
303303
logs = [item.payload for item in items]
304304
assert not logs
305305

@@ -323,7 +323,7 @@ def test_disable_sentry_logs_explicitly(
323323
logger.error("this is a log")
324324
logger.critical("this is a log")
325325

326-
sentry_sdk.get_client().flush()
326+
sentry_sdk.flush()
327327
logs = [item.payload for item in items]
328328
assert len(logs) == 0
329329

@@ -348,7 +348,7 @@ def test_no_log_infinite_loop(
348348
envelopes = capture_envelopes()
349349

350350
logger.debug("this is %s a template %s", "1", "2")
351-
sentry_sdk.get_client().flush()
351+
sentry_sdk.flush()
352352

353353
assert len(envelopes) == 1
354354

@@ -366,7 +366,7 @@ def test_logging_errors(
366366

367367
logger.error(Exception("test exc 1"))
368368
logger.error("error is %s", Exception("test exc 2"))
369-
sentry_sdk.get_client().flush()
369+
sentry_sdk.flush()
370370

371371
error_event_1 = envelopes[0].items[0].payload.json
372372
assert error_event_1["level"] == "error"
@@ -424,7 +424,7 @@ def record(self, val):
424424
with patch("loguru._handler.Message", FakeMessage):
425425
logger.error("some message")
426426

427-
sentry_sdk.get_client().flush()
427+
sentry_sdk.flush()
428428

429429
logs = [item.payload for item in items]
430430
assert len(logs) == 1
@@ -473,7 +473,7 @@ def record(self, val):
473473
with patch("loguru._handler.Message", FakeMessage):
474474
logger.error("some message")
475475

476-
sentry_sdk.get_client().flush()
476+
sentry_sdk.flush()
477477

478478
logs = [item.payload for item in items]
479479
assert len(logs) == 1
@@ -491,7 +491,7 @@ def test_logger_with_all_attributes(
491491
items = capture_items("log")
492492

493493
logger.warning("log #{}", 1)
494-
sentry_sdk.get_client().flush()
494+
sentry_sdk.flush()
495495

496496
logs = [item.payload for item in items]
497497

@@ -564,7 +564,7 @@ def test_logger_capture_parameters_from_args(
564564

565565
logger.warning("Task ID: {}", 123)
566566

567-
sentry_sdk.get_client().flush()
567+
sentry_sdk.flush()
568568

569569
logs = [item.payload for item in items]
570570

@@ -583,7 +583,7 @@ def test_logger_capture_parameters_from_kwargs(
583583

584584
logger.warning("Task ID: {task_id}", task_id=123)
585585

586-
sentry_sdk.get_client().flush()
586+
sentry_sdk.flush()
587587

588588
logs = [item.payload for item in items]
589589

@@ -603,7 +603,7 @@ def test_logger_capture_parameters_from_contextualize(
603603
with logger.contextualize(task_id=123):
604604
logger.warning("Log")
605605

606-
sentry_sdk.get_client().flush()
606+
sentry_sdk.flush()
607607

608608
logs = [item.payload for item in items]
609609

@@ -621,7 +621,7 @@ def test_logger_capture_parameters_from_bind(
621621
items = capture_items("log")
622622

623623
logger.bind(task_id=123).warning("Log")
624-
sentry_sdk.get_client().flush()
624+
sentry_sdk.flush()
625625

626626
logs = [item.payload for item in items]
627627

@@ -639,7 +639,7 @@ def test_logger_capture_parameters_from_patch(
639639
items = capture_items("log")
640640

641641
logger.patch(lambda record: record["extra"].update(task_id=123)).warning("Log")
642-
sentry_sdk.get_client().flush()
642+
sentry_sdk.flush()
643643

644644
logs = [item.payload for item in items]
645645

@@ -657,7 +657,7 @@ def test_no_parameters_no_template(
657657
items = capture_items("log")
658658

659659
logger.warning("Logging a hardcoded warning")
660-
sentry_sdk.get_client().flush()
660+
sentry_sdk.flush()
661661

662662
logs = [item.payload for item in items]
663663

‎tests/test_attributes.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def test_top_level_api(sentry_init, capture_items):
2121
sentry_sdk.remove_attribute("nonexistent")
2222

2323
sentry_sdk.metrics.count("test", 1)
24-
sentry_sdk.get_client().flush()
24+
sentry_sdk.flush()
2525

2626
metrics = [item.payload for item in items]
2727
(metric,) = metrics
@@ -56,7 +56,7 @@ def test_scope_precedence(sentry_init, capture_items):
5656
current_scope.set_attribute("overwritten.attribute", "current")
5757

5858
sentry_sdk.metrics.count("test", 1)
59-
sentry_sdk.get_client().flush()
59+
sentry_sdk.flush()
6060

6161
metrics = [item.payload for item in items]
6262
(metric,) = metrics
@@ -99,7 +99,7 @@ def test_telemetry_precedence(sentry_init, capture_items):
9999
},
100100
)
101101

102-
sentry_sdk.get_client().flush()
102+
sentry_sdk.flush()
103103

104104
metrics = [item.payload for item in items]
105105
(metric,) = metrics
@@ -122,7 +122,7 @@ def test_attribute_out_of_scope(sentry_init, capture_items):
122122

123123
sentry_sdk.metrics.count("test", 1)
124124

125-
sentry_sdk.get_client().flush()
125+
sentry_sdk.flush()
126126

127127
metrics = [item.payload for item in items]
128128
(metric,) = metrics
@@ -141,7 +141,7 @@ def test_remove_attribute(sentry_init, capture_items):
141141

142142
sentry_sdk.metrics.count("test", 1)
143143

144-
sentry_sdk.get_client().flush()
144+
sentry_sdk.flush()
145145

146146
metrics = [item.payload for item in items]
147147
(metric,) = metrics
@@ -177,7 +177,7 @@ class Cat:
177177

178178
sentry_sdk.metrics.count("test", 1)
179179

180-
sentry_sdk.get_client().flush()
180+
sentry_sdk.flush()
181181

182182
metrics = [item.payload for item in items]
183183
(metric,) = metrics
@@ -208,7 +208,7 @@ def test_user_attributes(sentry_init, capture_items):
208208
with sentry_sdk.traces.start_span(name="login"):
209209
sentry_sdk.metrics.count("test", 1)
210210

211-
sentry_sdk.get_client().flush()
211+
sentry_sdk.flush()
212212

213213
metric, span = [item.payload for item in items]
214214

‎tests/test_logs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ def test_transport_format(sentry_init, capture_envelopes):
547547

548548
sentry_sdk.logger.warning("This is a log...")
549549

550-
sentry_sdk.get_client().flush()
550+
sentry_sdk.flush()
551551

552552
assert len(envelopes) == 1
553553
assert len(envelopes[0].items) == 1

‎tests/test_metrics.py‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)