From c8a51379a4e7aee1720503ed32ae693d96f8c966 Mon Sep 17 00:00:00 2001 From: Khamid Date: Fri, 30 Oct 2026 21:50:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2=D1=82=D0=BE=D1=80=20=D1=82=D0=B5=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D1=81=D0=B5=D1=81=D1=81=D0=B8=D0=B8=20=D0=B2=20=D1=82?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B5=20=D1=81=D1=80=D0=BE=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- student-tests/failures/test_expiry.py | 34 ++++++++++++--------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/student-tests/failures/test_expiry.py b/student-tests/failures/test_expiry.py index 353dbe96..ad270e5d 100644 --- a/student-tests/failures/test_expiry.py +++ b/student-tests/failures/test_expiry.py @@ -1,4 +1,4 @@ -"""Истечение сессии. Проверяется на втором экземпляре API с SESSION_TTL_SECONDS=2 (порт 8081).""" +"""Истечение сессии и ключа. Проверяется на отдельном API с TTL 2 секунды (порт 8081, только compose.test.yaml).""" import datetime import time import unittest @@ -27,6 +27,20 @@ class SessionExpiryTest(unittest.TestCase): # logout с истёкшим токеном тоже 401 self.assertEqual(call("DELETE", "/api/v1/auth/sessions/current", user=user, base_url=SHORT_TTL_URL)[0], 401) + def test_idempotency_key_is_free_after_ttl(self): + user = new_user("idem", base_url=SHORT_TTL_URL) + chat = new_chat_short(user) + key = new_key() + first = send(user, chat, "первое", key=key, base_url=SHORT_TTL_URL) + repeat = send(user, chat, "первое", key=key, base_url=SHORT_TTL_URL) + self.assertEqual((first[0], repeat[1]), (201, first[1])) + time.sleep(2.2) + # сессия живёт столько же, поэтому нужен новый вход + _, session, _ = login(user["username"], user["password"], base_url=SHORT_TTL_URL) + again = send({**user, "token": session["token"]}, chat, "уже другое", key=key, base_url=SHORT_TTL_URL) + self.assertEqual(again[0], 201) + self.assertNotEqual(again[1]["id"], first[1]["id"]) + def test_expires_at_matches_ttl(self): user = new_user("ttl", base_url=SHORT_TTL_URL) _, session, _ = login(user["username"], user["password"], base_url=SHORT_TTL_URL) @@ -50,24 +64,6 @@ class SessionExpiryTest(unittest.TestCase): self.assertEqual(call("GET", "/api/v1/users/me", user=session, base_url=SHORT_TTL_URL)[0], 200) -class IdempotencyExpiryTest(SessionExpiryTest): - """Тот же стенд, IDEMPOTENCY_TTL_SECONDS=2: после срока ключ снова свободен.""" - - def test_key_is_free_after_ttl(self): - user = new_user("idem", base_url=SHORT_TTL_URL) - chat = new_chat_short(user) - key = new_key() - first = send(user, chat, "первое", key=key, base_url=SHORT_TTL_URL) - repeat = send(user, chat, "первое", key=key, base_url=SHORT_TTL_URL) - self.assertEqual((first[0], repeat[1]), (201, first[1])) - time.sleep(2.2) - # сессия живёт столько же, поэтому нужен новый вход - _, session, _ = login(user["username"], user["password"], base_url=SHORT_TTL_URL) - again = send({**user, "token": session["token"]}, chat, "уже другое", key=key, base_url=SHORT_TTL_URL) - self.assertEqual(again[0], 201) - self.assertNotEqual(again[1]["id"], first[1]["id"]) - - def new_chat_short(owner): body = {"title": "Чат", "member_ids": [owner["id"]]} status, chat, _ = call("POST", "/api/v1/chats", body, user=owner, base_url=SHORT_TTL_URL)