From 10da740e65c492c463d075ca4ced98aaed06e537 Mon Sep 17 00:00:00 2001 From: Vlad Lazar Date: Wed, 23 Jul 2025 19:41:30 +0100 Subject: [PATCH] fixup: pylints --- test_runner/fixtures/neon_fixtures.py | 5 +++-- test_runner/regress/test_auth.py | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py index cc1b03510c..fbe7752a77 100644 --- a/test_runner/fixtures/neon_fixtures.py +++ b/test_runner/fixtures/neon_fixtures.py @@ -28,15 +28,16 @@ import asyncpg import backoff import boto3 import httpx +import jwt import psycopg2 import psycopg2.sql import pytest import requests import toml -from jwcrypto import jwk from cryptography import x509 from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import serialization +from jwcrypto import jwk # Type-related stuff from psycopg2.extensions import connection as PgConnection @@ -411,7 +412,7 @@ class HadronTokenDecoder: public_key: str algorithm: str - def decode_token(self, token: str) -> Dict[str, Any]: + def decode_token(self, token: str) -> dict[str, Any]: return jwt.decode(token, self.public_key, algorithms=[self.algorithm]) diff --git a/test_runner/regress/test_auth.py b/test_runner/regress/test_auth.py index 60f8380bf4..4325956911 100644 --- a/test_runner/regress/test_auth.py +++ b/test_runner/regress/test_auth.py @@ -32,7 +32,6 @@ def assert_client_not_authorized(env: NeonEnv, http_client: PageserverHttpClient assert_client_authorized(env, http_client) - @pytest.mark.parametrize("use_hadron_auth_tokens", [True, False]) def test_pageserver_auth(neon_env_builder: NeonEnvBuilder, use_hadron_auth_tokens: bool): neon_env_builder.auth_enabled = True @@ -75,6 +74,7 @@ def test_pageserver_auth(neon_env_builder: NeonEnvBuilder, use_hadron_auth_token ): env.pageserver.tenant_create(TenantId.generate(), auth_token=tenant_token) + @pytest.mark.parametrize("use_hadron_auth_tokens", [True, False]) def test_compute_auth_to_pageserver(neon_env_builder: NeonEnvBuilder, use_hadron_auth_tokens: bool): neon_env_builder.auth_enabled = True @@ -95,6 +95,7 @@ def test_compute_auth_to_pageserver(neon_env_builder: NeonEnvBuilder, use_hadron cur.execute("SELECT sum(key) FROM t") assert cur.fetchone() == (5000050000,) + @pytest.mark.parametrize("use_hadron_auth_tokens", [True, False]) def test_pageserver_multiple_keys(neon_env_builder: NeonEnvBuilder, use_hadron_auth_tokens: bool): neon_env_builder.auth_enabled = True @@ -150,6 +151,7 @@ def test_pageserver_multiple_keys(neon_env_builder: NeonEnvBuilder, use_hadron_a assert_client_not_authorized(env, pageserver_http_client_old) assert_client_authorized(env, pageserver_http_client_new) + @pytest.mark.parametrize("use_hadron_auth_tokens", [True, False]) def test_pageserver_key_reload(neon_env_builder: NeonEnvBuilder, use_hadron_auth_tokens: bool): neon_env_builder.auth_enabled = True @@ -191,7 +193,9 @@ def test_pageserver_key_reload(neon_env_builder: NeonEnvBuilder, use_hadron_auth @pytest.mark.parametrize("auth_enabled", [False, True]) @pytest.mark.parametrize("use_hadron_auth_tokens", [True, False]) -def test_auth_failures(neon_env_builder: NeonEnvBuilder, auth_enabled: bool, use_hadron_auth_tokens: bool): +def test_auth_failures( + neon_env_builder: NeonEnvBuilder, auth_enabled: bool, use_hadron_auth_tokens: bool +): neon_env_builder.auth_enabled = auth_enabled neon_env_builder.use_hadron_auth_tokens = use_hadron_auth_tokens neon_env_builder.auth_enabled = auth_enabled