Merge branch 'potel-base' into antonpirker/potel/fix-celery

Author: antonpirker

tests/integrations/django/test_basic.py

@@ -415,7 +415,7 @@ def test_sql_dict_query_params(sentry_init, capture_events):
     assert crumb["message"] == (
         "SELECT count(*) FROM people_person WHERE foo = %(my_foo)s"
     )
-    assert crumb["data"]["db.params"] == '{"my_foo": 10}'
+    assert crumb["data"]["db.params"] == {"my_foo": 10}
 
 
 @pytest.mark.forked
@@ -477,7 +477,7 @@ def test_sql_psycopg2_string_composition(sentry_init, capture_events, query):
     (event,) = events
     crumb = event["breadcrumbs"]["values"][-1]
     assert crumb["message"] == ('SELECT %(my_param)s FROM "foobar"')
-    assert crumb["data"]["db.params"] == '{"my_param": 10}'
+    assert crumb["data"]["db.params"] == {"my_param": 10}
 
 
 @pytest.mark.forked
@@ -530,7 +530,7 @@ def test_sql_psycopg2_placeholders(sentry_init, capture_events):
         {
             "category": "query",
             "data": {
-                "db.params": '{"first_var": "fizz", "second_var": "not a date"}',
+                "db.params": {"first_var": "fizz", "second_var": "not a date"},
                 "db.paramstyle": "format",
             },
             "message": 'insert into my_test_table ("foo", "bar") values (%(first_var)s, '

tests/integrations/rq/test_rq.py

@@ -45,7 +45,6 @@ def do_trick(dog, trick):
     return "{}, can you {}? Good dog!".format(dog, trick)
 
 
-@pytest.mark.forked
 def test_basic(sentry_init, capture_events):
     sentry_init(integrations=[RqIntegration()])
     events = capture_events()
@@ -78,7 +77,6 @@ def test_basic(sentry_init, capture_events):
         assert "started_at" in extra
 
 
-@pytest.mark.forked
 def test_transport_shutdown(sentry_init, capture_events_forksafe):
     sentry_init(integrations=[RqIntegration()])
 
@@ -97,7 +95,6 @@ def test_transport_shutdown(sentry_init, capture_events_forksafe):
     assert exception["type"] == "ZeroDivisionError"
 
 
-@pytest.mark.forked
 def test_transaction_with_error(
     sentry_init, capture_events, DictionaryContaining  # noqa:N803
 ):
@@ -133,7 +130,6 @@ def test_transaction_with_error(
     )
 
 
-@pytest.mark.forked
 def test_error_has_trace_context_if_tracing_disabled(
     sentry_init,
     capture_events,
@@ -152,7 +148,6 @@ def test_error_has_trace_context_if_tracing_disabled(
     assert error_event["contexts"]["trace"]
 
 
-@pytest.mark.forked
 def test_tracing_enabled(
     sentry_init,
     capture_events,
@@ -173,7 +168,6 @@ def test_tracing_enabled(
     assert transaction["contexts"]["trace"] == error_event["contexts"]["trace"]
 
 
-@pytest.mark.forked
 def test_tracing_disabled(
     sentry_init,
     capture_events,
@@ -254,7 +248,6 @@ def test_traces_sampler_gets_correct_values_in_sampling_context(
     )
 
 
-@pytest.mark.forked
 @pytest.mark.skipif(
     parse_version(rq.__version__) < (1, 5), reason="At least rq-1.5 required"
 )