Enable Pytest lint

Author: leplatrem

pyproject.toml

@@ -12,7 +12,7 @@ select = [
     # isort
     "I",
     # pytest style
-    # "PT",
+    "PT",
     # eradicate commented code
     # "ERA",
     # ruff lint

tests/conftest.py

@@ -6,7 +6,7 @@
 import dockerflow.checks.registry
 
 
-@pytest.fixture
+@pytest.fixture()
 def version_content():
     """
     as documented on https://github.com/mozilla-services/Dockerflow/blob/main/docs/version_object.md
@@ -20,6 +20,6 @@ def version_content():
 
 
 @pytest.fixture(autouse=True)
-def clear_checks():
+def _clear_checks():
     yield
     dockerflow.checks.registry.clear_checks()

tests/core/test_logging.py

@@ -15,7 +15,7 @@
 
 
 @pytest.fixture()
-def reset_logging():
+def _reset_logging():
     logging.shutdown()
     reload(logging)
 
@@ -31,7 +31,8 @@ def assert_records(records):
     return details
 
 
-def test_initialization_from_ini(reset_logging, caplog, tmpdir):
+@pytest.mark.usefixtures("_reset_logging")
+def test_initialization_from_ini(caplog, tmpdir):
     ini_content = textwrap.dedent(
         """
     [loggers]
@@ -229,7 +230,5 @@ def test_ignore_json_message(caplog):
         }
     }
 }
-""".replace(
-        "\\", "\\\\"
-    )
+""".replace("\\", "\\\\")
 )  # HACK: Fix escaping for easy copy/paste

tests/django/test_django.py

@@ -20,19 +20,19 @@
 
 
 @pytest.fixture(autouse=True)
-def reset_checks():
+def _reset_checks():
     yield
     registry.registered_checks = set()
     registry.deployment_checks = set()
 
 
 @pytest.fixture(autouse=True)
-def setup_request_summary_logger(dockerflow_middleware):
+def _setup_request_summary_logger(dockerflow_middleware):
     dockerflow_middleware.summary_logger.addHandler(logging.NullHandler())
     dockerflow_middleware.summary_logger.setLevel(logging.INFO)
 
 
-@pytest.fixture
+@pytest.fixture()
 def dockerflow_middleware():
     return DockerflowMiddleware(get_response=HttpResponse())
 
@@ -55,7 +55,7 @@ def test_version_missing(dockerflow_middleware, mocker, rf):
     assert response.status_code == 404
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db()
 def test_heartbeat(client, settings):
     response = client.get("/__heartbeat__")
     assert response.status_code == 200
@@ -73,7 +73,7 @@ def test_heartbeat(client, settings):
     assert content.get("details") is None
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db()
 def test_heartbeat_debug(client, settings):
     settings.DOCKERFLOW_CHECKS = [
         "tests.django.django_checks.warning",
@@ -89,7 +89,7 @@ def test_heartbeat_debug(client, settings):
     assert content["details"]
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db()
 def test_heartbeat_silenced(client, settings):
     settings.DOCKERFLOW_CHECKS = [
         "tests.django.django_checks.warning",
@@ -107,8 +107,9 @@ def test_heartbeat_silenced(client, settings):
     assert "error" not in content["details"]
 
 
-@pytest.mark.django_db
-def test_heartbeat_logging(dockerflow_middleware, reset_checks, rf, settings, caplog):
+@pytest.mark.django_db()
+@pytest.mark.usefixtures("_reset_checks")
+def test_heartbeat_logging(dockerflow_middleware, rf, settings, caplog):
     request = rf.get("/__heartbeat__")
     settings.DOCKERFLOW_CHECKS = [
         "tests.django.django_checks.warning",
@@ -123,7 +124,7 @@ def test_heartbeat_logging(dockerflow_middleware, reset_checks, rf, settings, ca
     assert ("WARNING", "tests.checks.W001: some warning") in logged
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db()
 def test_lbheartbeat_makes_no_db_queries(dockerflow_middleware, rf):
     queries = CaptureQueriesContext(connection)
     request = rf.get("/__lbheartbeat__")
@@ -133,7 +134,7 @@ def test_lbheartbeat_makes_no_db_queries(dockerflow_middleware, rf):
     assert len(queries) == 0
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db()
 def test_redis_check(client, settings):
     settings.DOCKERFLOW_CHECKS = ["dockerflow.django.checks.check_redis_connected"]
     checks.register()
@@ -152,7 +153,7 @@ def assert_log_record(request, record, errno=0, level=logging.INFO):
     assert isinstance(record.t, int)
 
 
-@pytest.fixture
+@pytest.fixture()
 def dockerflow_request(rf):
     return rf.get("/", HTTP_USER_AGENT="dockerflow/tests", HTTP_ACCEPT_LANGUAGE="tlh")
 
@@ -233,15 +234,15 @@ def test_check_database_connected_misconfigured(mocker):
     assert errors[0].id == health.ERROR_MISCONFIGURED_DATABASE
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db()
 def test_check_database_connected_unsuable(mocker):
     mocker.patch("django.db.connection.is_usable", return_value=False)
     errors = checks.check_database_connected([])
     assert len(errors) == 1
     assert errors[0].id == health.ERROR_UNUSABLE_DATABASE
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db()
 def test_check_database_connected_success(mocker):
     errors = checks.check_database_connected([])
     assert errors == []
@@ -257,7 +258,7 @@ def test_check_migrations_applied_cannot_check_migrations(exception, mocker):
     assert errors[0].id == health.INFO_CANT_CHECK_MIGRATIONS
 
 
-@pytest.mark.django_db
+@pytest.mark.django_db()
 def test_check_migrations_applied_unapplied_migrations(mocker):
     mock_loader = mocker.patch("django.db.migrations.loader.MigrationLoader")
     mock_loader.return_value.applied_migrations = ["spam", "eggs"]
@@ -291,7 +292,7 @@ def test_check_migrations_applied_unapplied_migrations(mocker):
 
 
 @pytest.mark.parametrize(
-    "exception,error",
+    ("exception", "error"),
     [
         (redis.ConnectionError, health.ERROR_CANNOT_CONNECT_REDIS),
         (NotImplementedError, health.ERROR_MISSING_REDIS_CLIENT),

tests/fastapi/test_fastapi.py

@@ -20,12 +20,12 @@ def create_app():
     return app
 
 
-@pytest.fixture
+@pytest.fixture()
 def app():
     return create_app()
 
 
-@pytest.fixture
+@pytest.fixture()
 def client(app):
     return TestClient(app)
 
@@ -66,7 +66,7 @@ def test_mozlog_failure(client, mocker, caplog):
         "dockerflow.fastapi.views.get_version", side_effect=ValueError("crash")
     )
 
-    with pytest.raises(ValueError):
+    with pytest.raises(expected_exception=ValueError):
         client.get("/__version__")
 
     record = caplog.records[0]

tests/flask/test_flask.py

@@ -34,7 +34,7 @@ def load_user(user_id):
     return MockUser(user_id)
 
 
-@pytest.fixture
+@pytest.fixture()
 def app():
     app = Flask("dockerflow")
     app.secret_key = "super sekrit"
@@ -48,31 +48,31 @@ def client(app):
     return app.test_client()
 
 
-@pytest.fixture
+@pytest.fixture()
 def dockerflow(app):
     return Dockerflow(app)
 
 
 @pytest.fixture()
-def setup_request_summary_logger(dockerflow):
+def _setup_request_summary_logger(dockerflow):
     dockerflow.summary_logger.addHandler(logging.NullHandler())
     dockerflow.summary_logger.setLevel(logging.INFO)
 
 
-@pytest.fixture
+@pytest.fixture()
 def db(app):
     app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite://"
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
     return SQLAlchemy(app)
 
 
-@pytest.fixture
+@pytest.fixture()
 def migrate(app, db):
     test_migrations = os.path.join(os.path.dirname(__file__), "migrations")
     return Migrate(app, db, directory=test_migrations)
 
 
-@pytest.fixture
+@pytest.fixture()
 def redis_store(app):
     return FlaskRedis.from_custom_provider(FakeStrictRedis, app)
 
@@ -283,7 +283,8 @@ def assert_log_record(record, errno=0, level=logging.INFO):
 headers = {"User-Agent": "dockerflow/tests", "Accept-Language": "tlh"}
 
 
-def test_request_summary(caplog, app, client, setup_request_summary_logger):
+@pytest.mark.usefixtures("_setup_request_summary_logger")
+def test_request_summary(caplog, app, client):
     caplog.set_level(logging.INFO)
     with app.test_request_context("/"):
         client.get("/", headers=headers)
@@ -487,7 +488,7 @@ def test_check_migrations_applied_unapplied_migrations(mocker, app, db, migrate)
 
 
 @pytest.mark.parametrize(
-    "exception,error",
+    ("exception", "error"),
     [
         (redis.ConnectionError, health.ERROR_CANNOT_CONNECT_REDIS),
         (redis.RedisError, health.ERROR_REDIS_EXCEPTION),

tests/sanic/test_sanic.py

@@ -51,7 +51,7 @@ async def fake_redis(*args, **kw):
     return FakeRedis(*args, **kw)
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def app():
     app = Sanic(f"dockerflow-{uuid.uuid4().hex}")
 
@@ -64,24 +64,24 @@ async def root(request):
     return app
 
 
-@pytest.fixture
+@pytest.fixture()
 def dockerflow(app):
     return Dockerflow(app)
 
 
 @pytest.fixture()
-def setup_request_summary_logger(dockerflow):
+def _setup_request_summary_logger(dockerflow):
     dockerflow.summary_logger.addHandler(logging.NullHandler())
     dockerflow.summary_logger.setLevel(logging.INFO)
 
 
-@pytest.fixture
+@pytest.fixture()
 def dockerflow_redis(app):
     app.config["REDIS"] = {"address": "redis://:password@localhost:6379/0"}
     return Dockerflow(app, redis=SanicRedis(app))
 
 
-@pytest.fixture
+@pytest.fixture()
 def test_client(app):
     return SanicTestClient(app)
 
@@ -210,7 +210,7 @@ def test_redis_check(dockerflow_redis, mocker, test_client):
 
 
 @pytest.mark.parametrize(
-    "error,messages",
+    ("error", "messages"),
     [
         (
             "connection",
@@ -251,7 +251,8 @@ def assert_log_record(caplog, errno=0, level=logging.INFO, rid=None, t=int, path
 headers = {"User-Agent": "dockerflow/tests", "Accept-Language": "tlh"}
 
 
-def test_request_summary(caplog, setup_request_summary_logger, test_client):
+@pytest.mark.usefixtures("_setup_request_summary_logger")
+def test_request_summary(caplog, test_client):
     request, _ = test_client.get(headers=headers)
     assert isinstance(request.ctx.start_timestamp, float)
     assert request.ctx.id is not None
@@ -270,9 +271,8 @@ def exception_raiser(request):
     assert record.getMessage() == "exception message"
 
 
-def test_request_summary_failed_request(
-    app, caplog, setup_request_summary_logger, test_client
-):
+@pytest.mark.usefixtures("_setup_request_summary_logger")
+def test_request_summary_failed_request(app, caplog, test_client):
     @app.middleware
     def hostile_callback(request):
         # simulating resetting request changes