chore: Use top-level API in tests

Author: sentrivana

tests/integrations/flask/test_flask.py

@@ -380,7 +380,7 @@ def index():
         except ZeroDivisionError:
             pass
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     (first_event, error_event, session) = envelopes
     first_event = first_event.get_event()
@@ -1085,7 +1085,7 @@ def test_response_status_code_ok_in_transaction_context(
     client = app.test_client()
     client.get("/message")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     (_, transaction_envelope, _) = envelopes
     transaction = transaction_envelope.get_transaction_event()
@@ -1112,7 +1112,7 @@ def test_response_status_code_not_found_in_transaction_context(
     client = app.test_client()
     client.get("/not-existing-route")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     (transaction_envelope, _) = envelopes
     transaction = transaction_envelope.get_transaction_event()

tests/integrations/graphene/test_graphene.py

@@ -458,7 +458,7 @@ def graphql_server_sync():
     client = sync_app.test_client()
     client.post("/graphql", json=query)
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     spans = [item.payload for item in items]
     assert len(spans) == 2
@@ -518,7 +518,7 @@ def graphql_server_sync():
     client = sync_app.test_client()
     client.post("/graphql", json=query)
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     spans = [item.payload for item in items]
     assert len(spans) == 2
@@ -612,7 +612,7 @@ def graphql_server_sync():
     client = sync_app.test_client()
     client.post("/graphql", json=query)
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     events = [item.payload for item in items if item.type == "event"]
     assert len(events) == 1

tests/integrations/huey/test_huey.py

@@ -93,7 +93,7 @@ def division(a, b):
         execute_huey_task(
             huey, division, 1, int(not task_fails), exceptions=(DivisionByZero,)
         )
-        sentry_sdk.get_client().flush()
+        sentry_sdk.flush()
 
         payloads = [i.payload for i in items]
         # The task is enqueued without a wrapping span, so in streaming mode no
@@ -156,7 +156,7 @@ def retry_task(context):
     if has_span_streaming:
         items = capture_items("span")
         execute_huey_task(huey, retry_task, context)
-        sentry_sdk.get_client().flush()
+        sentry_sdk.flush()
 
         payloads = [i.payload for i in items]
         # The initial enqueue happens without a wrapping span, so no producer
@@ -179,7 +179,7 @@ def retry_task(context):
         task = huey.dequeue()
         huey.execute(task)
 
-        sentry_sdk.get_client().flush()
+        sentry_sdk.flush()
 
         all_payloads = [i.payload for i in items]
 
@@ -223,7 +223,7 @@ def cancel_task():
     if has_span_streaming:
         items = capture_items("span")
         execute_huey_task(huey, cancel_task)
-        sentry_sdk.get_client().flush()
+        sentry_sdk.flush()
 
         payloads = [i.payload for i in items]
         # Enqueued without a wrapping span -> no producer span in streaming mode.
@@ -269,7 +269,7 @@ def maybe_locked_task():
         with huey.lock_task(lock_name):
             assert huey.is_locked(task_lock_name) == should_be_locked
             execute_huey_task(huey, maybe_locked_task)
-        sentry_sdk.get_client().flush()
+        sentry_sdk.flush()
 
         payloads = [i.payload for i in items]
         # Enqueued without a wrapping span -> no producer span in streaming mode.
@@ -325,7 +325,7 @@ def division(a, b):
     if has_span_streaming:
         items = capture_items("event")
         execute_huey_task(huey, division, 1, b=0, exceptions=(DivisionByZero,))
-        sentry_sdk.get_client().flush()
+        sentry_sdk.flush()
         events = [item.payload for item in items]
     else:
         events = capture_events()
@@ -443,7 +443,7 @@ def task2():
             task = huey.dequeue()
             huey.execute(task)
 
-        sentry_sdk.get_client().flush()
+        sentry_sdk.flush()
         assert len(items) == 6
 
         (
@@ -575,7 +575,7 @@ def task2(results):
             task = huey.dequeue()
             huey.execute(task)
 
-        sentry_sdk.get_client().flush()
+        sentry_sdk.flush()
         assert len(items) == 6
 
         (

tests/integrations/loguru/test_loguru.py

@@ -145,7 +145,7 @@ def test_sentry_logs_warning(
 
     logger.warning("this is {} a {}", "just", "template")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
     logs = [item.payload for item in items]
 
     attrs = logs[0]["attributes"]
@@ -168,7 +168,7 @@ def test_sentry_logs_debug(
     envelopes = capture_envelopes()
 
     logger.debug("this is %s a template %s", "1", "2")
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     assert len(envelopes) == 0
 
@@ -194,7 +194,7 @@ def test_sentry_log_levels(sentry_init, capture_items, uninstall_integration, re
     logger.error("this is a log")
     logger.critical("this is a log")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
     logs = [item.payload for item in items]
     assert len(logs) == 4
 
@@ -229,7 +229,7 @@ def test_disable_loguru_logs(
     logger.error("this is a log")
     logger.critical("this is a log")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
     logs = [item.payload for item in items]
     assert len(logs) == 0
 
@@ -251,7 +251,7 @@ def test_disable_sentry_logs_by_default(
     logger.error("this is a log")
     logger.critical("this is a log")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
     logs = [item.payload for item in items]
     assert len(logs) == 0
 
@@ -274,7 +274,7 @@ def test_enable_sentry_logs_if_enable_logs_is_true(
     logger.error("this is a log")
     logger.critical("this is a log")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
     logs = [item.payload for item in items]
     assert len(logs) == 5
 
@@ -299,7 +299,7 @@ def test_disable_sentry_logs_if_enable_logs_is_true_but_integration_option_is_fa
     logger.error("this is a log")
     logger.critical("this is a log")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
     logs = [item.payload for item in items]
     assert not logs
 
@@ -323,7 +323,7 @@ def test_disable_sentry_logs_explicitly(
     logger.error("this is a log")
     logger.critical("this is a log")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
     logs = [item.payload for item in items]
     assert len(logs) == 0
 
@@ -348,7 +348,7 @@ def test_no_log_infinite_loop(
     envelopes = capture_envelopes()
 
     logger.debug("this is %s a template %s", "1", "2")
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     assert len(envelopes) == 1
 
@@ -366,7 +366,7 @@ def test_logging_errors(
 
     logger.error(Exception("test exc 1"))
     logger.error("error is %s", Exception("test exc 2"))
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     error_event_1 = envelopes[0].items[0].payload.json
     assert error_event_1["level"] == "error"
@@ -424,7 +424,7 @@ def record(self, val):
     with patch("loguru._handler.Message", FakeMessage):
         logger.error("some message")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     logs = [item.payload for item in items]
     assert len(logs) == 1
@@ -473,7 +473,7 @@ def record(self, val):
     with patch("loguru._handler.Message", FakeMessage):
         logger.error("some message")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     logs = [item.payload for item in items]
     assert len(logs) == 1
@@ -491,7 +491,7 @@ def test_logger_with_all_attributes(
     items = capture_items("log")
 
     logger.warning("log #{}", 1)
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     logs = [item.payload for item in items]
 
@@ -564,7 +564,7 @@ def test_logger_capture_parameters_from_args(
 
     logger.warning("Task ID: {}", 123)
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     logs = [item.payload for item in items]
 
@@ -583,7 +583,7 @@ def test_logger_capture_parameters_from_kwargs(
 
     logger.warning("Task ID: {task_id}", task_id=123)
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     logs = [item.payload for item in items]
 
@@ -603,7 +603,7 @@ def test_logger_capture_parameters_from_contextualize(
     with logger.contextualize(task_id=123):
         logger.warning("Log")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     logs = [item.payload for item in items]
 
@@ -621,7 +621,7 @@ def test_logger_capture_parameters_from_bind(
     items = capture_items("log")
 
     logger.bind(task_id=123).warning("Log")
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     logs = [item.payload for item in items]
 
@@ -639,7 +639,7 @@ def test_logger_capture_parameters_from_patch(
     items = capture_items("log")
 
     logger.patch(lambda record: record["extra"].update(task_id=123)).warning("Log")
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     logs = [item.payload for item in items]
 
@@ -657,7 +657,7 @@ def test_no_parameters_no_template(
     items = capture_items("log")
 
     logger.warning("Logging a hardcoded warning")
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     logs = [item.payload for item in items]
 

tests/test_attributes.py

@@ -21,7 +21,7 @@ def test_top_level_api(sentry_init, capture_items):
     sentry_sdk.remove_attribute("nonexistent")
 
     sentry_sdk.metrics.count("test", 1)
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     metrics = [item.payload for item in items]
     (metric,) = metrics
@@ -56,7 +56,7 @@ def test_scope_precedence(sentry_init, capture_items):
     current_scope.set_attribute("overwritten.attribute", "current")
 
     sentry_sdk.metrics.count("test", 1)
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     metrics = [item.payload for item in items]
     (metric,) = metrics
@@ -99,7 +99,7 @@ def test_telemetry_precedence(sentry_init, capture_items):
         },
     )
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     metrics = [item.payload for item in items]
     (metric,) = metrics
@@ -122,7 +122,7 @@ def test_attribute_out_of_scope(sentry_init, capture_items):
 
     sentry_sdk.metrics.count("test", 1)
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     metrics = [item.payload for item in items]
     (metric,) = metrics
@@ -141,7 +141,7 @@ def test_remove_attribute(sentry_init, capture_items):
 
         sentry_sdk.metrics.count("test", 1)
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     metrics = [item.payload for item in items]
     (metric,) = metrics
@@ -177,7 +177,7 @@ class Cat:
 
         sentry_sdk.metrics.count("test", 1)
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     metrics = [item.payload for item in items]
     (metric,) = metrics
@@ -208,7 +208,7 @@ def test_user_attributes(sentry_init, capture_items):
     with sentry_sdk.traces.start_span(name="login"):
         sentry_sdk.metrics.count("test", 1)
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     metric, span = [item.payload for item in items]
 

tests/test_logs.py

@@ -547,7 +547,7 @@ def test_transport_format(sentry_init, capture_envelopes):
 
     sentry_sdk.logger.warning("This is a log...")
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     assert len(envelopes) == 1
     assert len(envelopes[0].items) == 1

tests/test_metrics.py

@@ -333,7 +333,7 @@ def test_transport_format(sentry_init, capture_envelopes):
 
     sentry_sdk.metrics.count("test.counter", 1)
 
-    sentry_sdk.get_client().flush()
+    sentry_sdk.flush()
 
     assert len(envelopes) == 1
     assert len(envelopes[0].items) == 1