Fix PT003 pytest-extraneous-scope-function

TimPansino · TimPansino · commit 00d6de66c6a7 · 2025-05-13T11:05:58.000-07:00
diff --git a/tests/agent_features/test_configuration.py b/tests/agent_features/test_configuration.py
@@ -47,7 +47,7 @@
 SKIP_IF_NOT_PY311 = pytest.mark.skipif(sys.version_info < (3, 11), reason="TOML not in the standard library.")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def collector_available_fixture():
     # Disable fixture that requires real application to exist for this file
     pass
diff --git a/tests/agent_features/test_metric_normalization.py b/tests/agent_features/test_metric_normalization.py
@@ -40,7 +40,7 @@ def core_app(collector_agent_registration):
     return app._agent.application(app.name)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def rules_engine_fixture(core_app):
     rules_engine = core_app._rules_engine
     previous_rules = rules_engine["metric"]
diff --git a/tests/agent_features/test_serverless_mode.py b/tests/agent_features/test_serverless_mode.py
@@ -28,7 +28,7 @@
 from newrelic.core.config import global_settings
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def serverless_application(request):
     settings = global_settings()
     orig = settings.serverless_mode.enabled
diff --git a/tests/agent_streaming/conftest.py b/tests/agent_streaming/conftest.py
@@ -68,7 +68,7 @@ def wait(self, *args, **kwargs):
         return super(SetEventOnWait, self).wait(*args, **kwargs)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def buffer_empty_event(monkeypatch):
     event = threading.Event()
 
@@ -85,23 +85,23 @@ def batching(request):
     return request.param
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def spans_received():
     from _test_handler import SPANS_RECEIVED
 
     SPANS_RECEIVED.clear()
     return SPANS_RECEIVED
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def span_batches_received():
     from _test_handler import SPAN_BATCHES_RECEIVED
 
     SPAN_BATCHES_RECEIVED.clear()
     return SPAN_BATCHES_RECEIVED
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def spans_processed_event():
     from _test_handler import SPANS_PROCESSED_EVENT
 
diff --git a/tests/agent_streaming/test_stream_buffer.py b/tests/agent_streaming/test_stream_buffer.py
@@ -29,7 +29,7 @@ def stop_iteration_condition(*args, **kwargs):
     return StopIterationOnWait(*args, **kwargs)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def stop_iteration_on_wait(monkeypatch):
     monkeypatch.setattr(StreamBuffer, "condition", stop_iteration_condition)
 
diff --git a/tests/agent_unittests/conftest.py b/tests/agent_unittests/conftest.py
@@ -44,7 +44,7 @@ class FakeProtos:
 sys.modules["newrelic.core.infinite_tracing_pb2"] = FakeProtos
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def global_settings(request, monkeypatch):
     ini_contents = request.getfixturevalue("ini")
 
diff --git a/tests/agent_unittests/test_package_version_utils.py b/tests/agent_unittests/test_package_version_utils.py
@@ -41,7 +41,7 @@
 SKIP_IF_NOT_PY310_PLUS = pytest.mark.skipif(not IS_PY310_PLUS, reason="These features were added in 3.10+")
 
 
-@pytest.fixture(scope="function", autouse=True)
+@pytest.fixture(autouse=True)
 def patched_pytest_module(monkeypatch):
     for attr in VERSION_ATTRS:
         if hasattr(pytest, attr):
@@ -50,7 +50,7 @@ def patched_pytest_module(monkeypatch):
     yield pytest
 
 
-@pytest.fixture(scope="function", autouse=True)
+@pytest.fixture(autouse=True)
 def cleared_package_version_cache():
     """Ensure cache is empty before every test to exercise code paths."""
     _get_package_version.cache_clear()
diff --git a/tests/agent_unittests/test_trace_cache.py b/tests/agent_unittests/test_trace_cache.py
@@ -25,7 +25,7 @@ class DummyTrace:
     pass
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def trace_cache():
     return TraceCache()
 
@@ -54,7 +54,7 @@ def test_trace_cache_methods(trace_cache):
     assert len(list(trace_cache.values())) == 1
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def iterate_trace_cache(trace_cache):
     def _iterate_trace_cache(shutdown):
         while True:
@@ -70,7 +70,7 @@ def _iterate_trace_cache(shutdown):
     return _iterate_trace_cache
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def change_weakref_dict_size(trace_cache):
     def _change_weakref_dict_size(shutdown, obj_refs):
         """
diff --git a/tests/agent_unittests/test_wrappers.py b/tests/agent_unittests/test_wrappers.py
@@ -17,7 +17,7 @@
 from newrelic.common.object_wrapper import function_wrapper
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def wrapper():
     @function_wrapper
     def _wrapper(wrapped, instance, args, kwargs):
@@ -26,7 +26,7 @@ def _wrapper(wrapped, instance, args, kwargs):
     return _wrapper
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def wrapped_function(wrapper):
     @wrapper
     def wrapped():
diff --git a/tests/cross_agent/fixtures/ecs_container_id/ecs_mock_server.py b/tests/cross_agent/fixtures/ecs_container_id/ecs_mock_server.py
@@ -117,13 +117,13 @@ def bad_response_get(self):
     self.wfile.write(response)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def mock_server():
     with MockExternalHTTPServer(handler=simple_get) as mock_server:
         yield mock_server
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def bad_response_mock_server():
     with MockExternalHTTPServer(handler=bad_response_get) as bad_response_mock_server:
         yield bad_response_mock_server
diff --git a/tests/datastore_cassandradriver/conftest.py b/tests/datastore_cassandradriver/conftest.py
@@ -40,7 +40,7 @@
 )
 
 
-@pytest.fixture(scope="function", params=["Libev", "AsyncCore", "Twisted"])
+@pytest.fixture(params=["Libev", "AsyncCore", "Twisted"])
 def connection_class(request):
     # Configure tests to run against a specific async reactor.
     reactor_name = request.param
@@ -62,7 +62,7 @@ def connection_class(request):
     return Connection
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def cluster_options(connection_class):
     from cassandra.cluster import ExecutionProfile
     from cassandra.policies import RoundRobinPolicy
@@ -80,7 +80,7 @@ def cluster_options(connection_class):
     yield cluster_options
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def cluster(cluster_options):
     from cassandra.cluster import Cluster
 
diff --git a/tests/datastore_cassandradriver/test_cassandra.py b/tests/datastore_cassandradriver/test_cassandra.py
@@ -29,7 +29,7 @@
 REPLICATION_STRATEGY = "{ 'class' : 'SimpleStrategy', 'replication_factor' : 1 }"
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def exercise(cluster):
     def _exercise(is_async=False):
         with cluster.connect() as session:
diff --git a/tests/datastore_cassandradriver/test_cqlengine.py b/tests/datastore_cassandradriver/test_cqlengine.py
@@ -41,7 +41,7 @@ class ABCModel(Model):
     b = columns.Double()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def exercise(cluster_options):
     # Silence warning from cqlengine when creating tables
     os.environ["CQLENG_ALLOW_SCHEMA_MANAGEMENT"] = "true"
diff --git a/tests/datastore_elasticsearch/conftest.py b/tests/datastore_elasticsearch/conftest.py
@@ -45,7 +45,7 @@
 RUN_IF_V7_OR_BELOW = pytest.mark.skipif(not IS_V7_OR_BELOW, reason="Unsupported for elasticsearch<=7")
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def client():
     from elasticsearch import Elasticsearch
 
@@ -54,7 +54,7 @@ def client():
     _client.close()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def async_client(loop):
     from elasticsearch import AsyncElasticsearch
 
diff --git a/tests/datastore_firestore/conftest.py b/tests/datastore_firestore/conftest.py
@@ -64,7 +64,7 @@ def client():
     return client
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def collection(client):
     collection_ = client.collection(f"firestore_collection_{str(uuid.uuid4())}")
     yield collection_
@@ -81,7 +81,7 @@ def async_client(loop):
     return client
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def async_collection(async_client, collection):
     # Use the same collection name as the collection fixture
     yield async_client.collection(collection.id)
diff --git a/tests/datastore_psycopg/conftest.py b/tests/datastore_psycopg/conftest.py
@@ -43,7 +43,7 @@ def is_async(request):
     return request.param == "async"
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def connection(loop, is_async):
     import psycopg
 
@@ -70,7 +70,7 @@ def connection(loop, is_async):
     loop.run_until_complete(maybe_await(connection.close()))
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def multiple_connections(loop, is_async):
     import psycopg
 
diff --git a/tests/external_httpx/conftest.py b/tests/external_httpx/conftest.py
@@ -49,11 +49,11 @@ class RealHTTP2Server:
     yield RealHTTP2Server
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def sync_client(httpx):
     return httpx.Client()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def async_client(httpx):
     return httpx.AsyncClient()
diff --git a/tests/framework_bottle/conftest.py b/tests/framework_bottle/conftest.py
@@ -29,7 +29,7 @@
 )
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def target_application():
     import _target_application
 
diff --git a/tests/logger_logging/conftest.py b/tests/logger_logging/conftest.py
@@ -53,7 +53,7 @@ def emit(self, record):
         self.records.append(self.format(record))
 
 
-@pytest.fixture(scope="function", params=["instrumented_logger", "forwarding_handler"])
+@pytest.fixture(params=["instrumented_logger", "forwarding_handler"])
 def logger(request):
     _logger = logging.getLogger("my_app")
     caplog = CaplogHandler()
@@ -83,7 +83,7 @@ def logger(request):
     logging.Logger.callHandlers = instrumented
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def instrumented_logger():
     _logger = logging.getLogger("my_app")
     caplog = CaplogHandler()
diff --git a/tests/logger_logging/test_logging_handler.py b/tests/logger_logging/test_logging_handler.py
@@ -31,7 +31,7 @@
 from newrelic.api.transaction import current_transaction
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def uninstrument_logging():
     instrumented = logging.Logger.callHandlers
     while hasattr(logging.Logger.callHandlers, "__wrapped__"):
@@ -40,7 +40,7 @@ def uninstrument_logging():
     logging.Logger.callHandlers = instrumented
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def formatting_logger(conf_logger, uninstrument_logging):
     handler = NewRelicLogForwardingHandler()
     handler.setFormatter(logging.Formatter(r"%(levelname)s - %(message)s"))
diff --git a/tests/logger_loguru/conftest.py b/tests/logger_loguru/conftest.py
@@ -51,7 +51,7 @@ def emit(self, record):
         self.records.append(self.format(record))
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def logger():
     import loguru
 
diff --git a/tests/logger_structlog/conftest.py b/tests/logger_structlog/conftest.py
@@ -83,12 +83,12 @@ def drop_event_processor(logger, method_name, event_dict):
         return event_dict
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def structlog_caplog(StructLogCapLog):
     return StructLogCapLog()
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def logger(structlog_caplog):
     import structlog
 
@@ -97,7 +97,7 @@ def logger(structlog_caplog):
     return _logger
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def filtering_logger(structlog_caplog):
     import structlog
 
diff --git a/tests/logger_structlog/test_attributes.py b/tests/logger_structlog/test_attributes.py
@@ -19,7 +19,7 @@
 from newrelic.api.background_task import background_task
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def logger(structlog_caplog):
     import structlog
 
diff --git a/tests/logger_structlog/test_log_forwarding.py b/tests/logger_structlog/test_log_forwarding.py
@@ -37,7 +37,7 @@
 }
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def callsite_parameter_logger(structlog_caplog):
     import structlog
 
diff --git a/tests/logger_structlog/test_processor_formatter.py b/tests/logger_structlog/test_processor_formatter.py
@@ -37,7 +37,7 @@
 """
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def structlog_formatter_within_logging(structlog_caplog):
     import logging
 
diff --git a/tests/messagebroker_confluentkafka/conftest.py b/tests/messagebroker_confluentkafka/conftest.py
diff --git a/tests/messagebroker_confluentkafka/test_consumer.py b/tests/messagebroker_confluentkafka/test_consumer.py
diff --git a/tests/messagebroker_confluentkafka/test_producer.py b/tests/messagebroker_confluentkafka/test_producer.py
diff --git a/tests/messagebroker_kafkapython/conftest.py b/tests/messagebroker_kafkapython/conftest.py
diff --git a/tests/messagebroker_kafkapython/test_consumer.py b/tests/messagebroker_kafkapython/test_consumer.py
diff --git a/tests/messagebroker_kafkapython/test_producer.py b/tests/messagebroker_kafkapython/test_producer.py
diff --git a/tests/messagebroker_kombu/conftest.py b/tests/messagebroker_kombu/conftest.py
diff --git a/tests/mlmodel_sklearn/test_prediction_stats.py b/tests/mlmodel_sklearn/test_prediction_stats.py
diff --git a/tests/testing_support/fixtures.py b/tests/testing_support/fixtures.py
