Merge pull request #1372 from newrelic/fix-linter-pyteststyle

Enable linter flake8-pytest-style

Author: hmstepanek

pyproject.toml

@@ -59,7 +59,7 @@ select = [
     "G",  # flake8-logging-format
     "INP",  # flake8-no-pep420
     "PYI",  # flake8-pyi
-    # "PT",  # flake8-pytest-style
+    "PT",  # flake8-pytest-style
     "Q",  # flake8-quotes
     "RSE",  # flake8-raise
     # "RET",  # flake8-return
@@ -101,13 +101,13 @@ select = [
 
 ignore = [
     # Temporarily disabled rules
-    "RUF100",  # unused-noqa (TODO: remove this once all linters are enabled)
     "PERF203",  # try-except-in-loop (most of these are unavoidable)
     "S110",  # try-except-pass (Bandit wants us to log the exception, which is usually pointless. Spot check these later)
     "PLW0603",  # global-statement (this is currently used extensively)
     "PLW2901",  # redefined-loop-name (frequently used, not generally an issue)
     "PLR",  # Pylint Recommendations (too many to fix all at once)
     "E722",  # bare-except (too many to fix all at once)
+    "PT012",  # pytest-raises-with-multiple-statements (too many to fix all at once)
     # Permanently disabled rules
     "UP006",  # non-pep585-annotation (not compatible with Python 3.7 or 3.8)
     "D203",  # incorrect-blank-line-before-class
@@ -144,6 +144,9 @@ ignore = [
     "PLR2004",  # magic-value-comparison (comparing to constant values)
     "ASYNC251",  # blocking-sleep-in-async-function (acceptable in tests)
     "B904",  # raise-without-from-inside-except (not necessary in tests)
+    "PT006",  # pytest-parametrize-names-wrong-type (style choice)
+    "PT007",  # pytest-parametrize-values-wrong-type (style choice)
+    "PT011",  # pytest-raises-too-broad (we frequently test for generic errors)
 ]
 "newrelic/admin/*" = [
     # Disabled rules in admin scripts

tests/agent_features/test_async_generator_trace.py

@@ -273,7 +273,7 @@ async def _test():
         await gen.asend(None)
 
         assert await gen.asend("foobar") == "foobar"
-        assert _received and _received[0] == "foobar"
+        assert _received[0] == "foobar"
 
         # finish consumption of the coroutine if necessary
         async for _ in gen:

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

tests/agent_features/test_logs_in_context.py

@@ -241,7 +241,7 @@ def test_newrelic_logger_error_inside_transaction_with_stack_trace(log_buffer_wi
     assert filename.endswith("/test_logs_in_context.py")
     assert isinstance(line_number, int)
     assert isinstance(stack_trace, str)
-    assert stack_trace and stack_trace == expected_stack_trace
+    assert stack_trace == expected_stack_trace
 
     expected = {
         "entity.name": "Python Agent Test (agent_features)",
@@ -329,7 +329,7 @@ def test_newrelic_logger_error_outside_transaction_with_stack_trace(log_buffer_w
     assert filename.endswith("/test_logs_in_context.py")
     assert isinstance(line_number, int)
     assert isinstance(stack_trace, str)
-    assert stack_trace and stack_trace == expected_stack_trace
+    assert stack_trace == expected_stack_trace
 
     expected = {
         "entity.name": "Python Agent Test (agent_features)",

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"]

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

tests/agent_features/test_web_transaction.py

@@ -141,7 +141,7 @@ def test_base_web_transaction(use_bytes):
         transaction.process_response(200, response_headers)
 
 
-@pytest.fixture()
+@pytest.fixture
 def validate_no_garbage():
     yield
 

tests/agent_streaming/conftest.py

@@ -68,7 +68,7 @@ def wait(self, *args, **kwargs):
         return super().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
 

tests/agent_streaming/test_infinite_tracing.py

@@ -31,7 +31,7 @@
 CONDITION_CLS = type(threading.Condition())
 
 
-@pytest.fixture()
+@pytest.fixture
 def app():
     app = Application("Python Agent Test (Infinite Tracing)")
     yield app

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)