From 5898fdb07209043191eb74c26361ddbe0d718d74 Mon Sep 17 00:00:00 2001 From: Evgeny Bushkov Date: Fri, 23 Oct 2026 22:11:45 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D1=82=D0=B5=D1=81=D1=82=20=D0=B8=D1=81=D1=82=D0=B5?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B5=D1=81=D1=81=D0=B8?= =?UTF-8?q?=D0=B8=20=D1=83=D1=81=D1=82=D0=BE=D0=B9=D1=87=D0=B8=D0=B2=D1=8B?= =?UTF-8?q?=D0=BC=20=D0=BA=20TTL=20=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B0=D0=B2=D0=B0=D1=82=D1=8C=20TTL=20=D1=87=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B7=20Makefile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: aider (deepseek/deepseek-chat) --- Makefile | 2 +- tests/test_expiry.py | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 25abafc1..0af02316 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ test-unit: $(PYTHON) tests/test_unit.py --base-url $(BASE_URL) test-expiry: - $(PYTHON) tests/test_expiry.py --base-url $(BASE_URL) + $(PYTHON) tests/test_expiry.py --base-url $(BASE_URL) --ttl $(or $(SESSION_TTL_SECONDS),2) test-deps: $(PYTHON) tests/test_dependency_failure.py --base-url $(BASE_URL) diff --git a/tests/test_expiry.py b/tests/test_expiry.py index 187ac985..04e9151c 100644 --- a/tests/test_expiry.py +++ b/tests/test_expiry.py @@ -64,9 +64,21 @@ class ExpiryTests(unittest.TestCase): status, session = request("POST", "/api/v1/auth/sessions", basic=basic) self.assertEqual(status, 201, session) token = session["token"] + # Проверяем, что API реально запущен с коротким TTL: иначе тест + # будет ждать час и всё равно упадёт. + expires_at = session["expires_at"] + from datetime import datetime, timezone + exp = datetime.strptime(expires_at, "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=timezone.utc) + actual_ttl = (exp - datetime.now(timezone.utc)).total_seconds() + self.assertLessEqual( + actual_ttl, + 10, + "API запущен с TTL=" + str(int(actual_ttl)) + "s; перезапустите стенд с " + "SESSION_TTL_SECONDS=2 (например: SESSION_TTL_SECONDS=2 docker compose up -d api)", + ) status, _ = request("GET", "/api/v1/users/me", token=token) self.assertEqual(status, 200) - time.sleep(TTL + 2) + time.sleep(actual_ttl + 2) status, body = request("GET", "/api/v1/users/me", token=token) self.assertEqual(status, 401) self.assertEqual(body["error"]["code"], "unauthorized")