fix(mcp): messages d erreur exploitables et rejeu unique sur HTTP 502/503/504 et timeout (infra-2026-10-042b)

This commit is contained in:
bolbol committed 2026-10-12 04:34:38 +02:00
1 parent cc20ccef2f
commit 67f33fc81e
2 files changed
+283 -53

No files matched your search

+129
View File
@@ -10,6 +10,7 @@ import os
import tempfile
import time
import unittest
import httpx
from unittest.mock import AsyncMock, patch
import server
@@ -195,5 +196,133 @@ class TestNotebookMcp(unittest.IsolatedAsyncioTestCase):
self.assertNotIn("test_super_secret_password_1234", line)
@patch("asyncio.sleep")
@patch("server.on_request")
async def test_message_erreur_non_vide(self, mock_on_request, mock_sleep):
"""Vérifie que les erreurs (ReadTimeout, ConnectTimeout, 502 après rejeu)
produisent un message en français, jamais vide, nommant la panne et indiquant si un nouvel essai a un sens."""
server.CURRENT_IDENTITY.set("test-pilote")
server.create_notebook_entry("notebook:a1", "test-a", "Carnet A", "", "test-pilote")
# 1. Cas ReadTimeout
mock_on_request.side_effect = httpx.ReadTimeout("")
with self.assertRaises(Exception) as ctx:
await server.notebook_ask("notebook:a1", "question test")
msg = str(ctx.exception)
self.assertTrue(len(msg) > 0, "Le message ReadTimeout ne doit pas être vide")
self.assertIn("délai dépassé", msg.lower())
self.assertTrue("essai" in msg.lower() or "réessayer" in msg.lower())
self.assertNotIn("question test", msg)
self.assertNotIn("notebook:a1", msg)
# 2. Cas ConnectTimeout
mock_on_request.side_effect = httpx.ConnectTimeout("")
with self.assertRaises(Exception) as ctx:
await server.notebook_ask("notebook:a1", "question test")
msg = str(ctx.exception)
self.assertTrue(len(msg) > 0, "Le message ConnectTimeout ne doit pas être vide")
self.assertIn("délai dépassé", msg.lower())
self.assertTrue("essai" in msg.lower() or "réessayer" in msg.lower())
self.assertNotIn("question test", msg)
self.assertNotIn("notebook:a1", msg)
# 3. Cas HTTP 502 après rejeu
mock_on_request.side_effect = None
mock_on_request.return_value = (502, "Bad Gateway")
with self.assertRaises(Exception) as ctx:
await server.notebook_ask("notebook:a1", "question test")
msg = str(ctx.exception)
self.assertTrue(len(msg) > 0, "Le message 502 ne doit pas être vide")
self.assertIn("502", msg)
self.assertIn("open notebook a répondu http 502", msg.lower())
self.assertTrue("essai" in msg.lower() or "réessayer" in msg.lower())
self.assertNotIn("question test", msg)
self.assertNotIn("notebook:a1", msg)
@patch("asyncio.sleep")
@patch("server.on_request")
async def test_rejeu_unique_sur_502(self, mock_on_request, mock_sleep):
"""Vérifie que notebook_ask rejoue une seule fois après 2 secondes sur 502."""
server.CURRENT_IDENTITY.set("test-pilote")
server.create_notebook_entry("notebook:a1", "test-a", "Carnet A", "", "test-pilote")
# Cas 1 : 1er appel 502, 2nd appel 200 (succès après rejeu)
call_count = 0
async def fake_retry(method, path, body=None):
nonlocal call_count
if path == "/models/defaults":
return 200, {"default_chat_model": "test-model"}
if path == "/search/ask/simple":
call_count += 1
if call_count == 1:
return 502, "Bad Gateway"
return 200, {"answer": "Réponse après rejeu réussi", "sources": []}
return 404, {}
mock_on_request.side_effect = fake_retry
rep = await server.notebook_ask("notebook:a1", "question test")
self.assertEqual(rep["answer"], "Réponse après rejeu réussi")
self.assertEqual(call_count, 2, "Doit avoir été appelé exactement 2 fois (1 tentative + 1 rejeu)")
mock_sleep.assert_called_with(2.0)
# Cas 2 : les deux appels échouent en 502 (rejeu unique, arrêt à 2)
call_count_fail = 0
async def fake_both_fail(method, path, body=None):
nonlocal call_count_fail
if path == "/models/defaults":
return 200, {"default_chat_model": "test-model"}
if path == "/search/ask/simple":
call_count_fail += 1
return 502, "Bad Gateway"
return 404, {}
mock_on_request.side_effect = fake_both_fail
with self.assertRaises(Exception) as ctx:
await server.notebook_ask("notebook:a1", "question test")
self.assertEqual(call_count_fail, 2, "Doit s'arrêter après un unique rejeu (2 appels au total)")
self.assertIn("502", str(ctx.exception))
@patch("asyncio.sleep")
@patch("server.on_request")
async def test_rejeu_sur_timeout_reussi(self, mock_on_request, mock_sleep):
"""Vérifie que notebook_ask rejoue après un timeout et réussit si le second appel passe."""
server.CURRENT_IDENTITY.set("test-pilote")
server.create_notebook_entry("notebook:a1", "test-a", "Carnet A", "", "test-pilote")
call_count = 0
async def fake_timeout_then_ok(method, path, body=None):
nonlocal call_count
if path == "/models/defaults":
return 200, {"default_chat_model": "test-model"}
if path == "/search/ask/simple":
call_count += 1
if call_count == 1:
raise httpx.ReadTimeout("timed out")
return 200, {"answer": "Réponse après timeout résolu", "sources": []}
return 404, {}
mock_on_request.side_effect = fake_timeout_then_ok
rep = await server.notebook_ask("notebook:a1", "question test")
self.assertEqual(rep["answer"], "Réponse après timeout résolu")
self.assertEqual(call_count, 2)
mock_sleep.assert_called_with(2.0)
@patch("server.on_request")
async def test_aucun_rejeu_autres_outils(self, mock_on_request):
"""Vérifie qu'aucun rejeu n'est effectué pour les autres outils (source_add_text, etc.)."""
server.CURRENT_IDENTITY.set("test-pilote")
server.create_notebook_entry("notebook:a1", "test-a", "Carnet A", "", "test-pilote")
mock_on_request.return_value = (502, "Bad Gateway")
with self.assertRaises(Exception) as ctx:
await server.source_add_text("notebook:a1", "Titre", "Contenu")
self.assertEqual(mock_on_request.call_count, 1)
self.assertIn("502", str(ctx.exception))
if __name__ == "__main__":
unittest.main()