chore(ci): fix test spans being incorrectly marked as failed

tests/conftest.py

@@ -25,7 +25,6 @@
 import warnings
 
 from _pytest.runner import call_and_report
-from _pytest.runner import pytest_runtest_protocol as default_pytest_runtest_protocol
 import pytest
 
 import ddtrace
@@ -415,11 +414,11 @@ def pytest_collection_modifyitems(session, config, items):
 @pytest.hookimpl(tryfirst=True)
 def pytest_runtest_protocol(item):
     if item.get_closest_marker("skip"):
-        return default_pytest_runtest_protocol(item, None)
+        return None
 
     skipif = item.get_closest_marker("skipif")
     if skipif and skipif.args[0]:
-        return default_pytest_runtest_protocol(item, None)
+        return None
 
     marker = item.get_closest_marker("subprocess")
     if marker:

tests/contrib/django/test_django.py

@@ -1556,7 +1556,8 @@ def test_connection(client, test_spans):
     assert span.get_tag("django.db.alias") == "default"
 
 if __name__ == "__main__":
-    sys.exit(pytest.main(["-x", __file__]))
+    # --reuse-db needed so the subprocess will not delete the main process database.
+    sys.exit(pytest.main(["-x", "--reuse-db", __file__]))
     """.format(
         expected_service_name
     )