alex/manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplifications and refactorings

Browse Source
This commit is contained in:
Alex
2026-05-04 16:59:06 +02:00
parent e14cb8a654
commit 4cdb4b144c
18 changed files with 30 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/tests/test_api.py
+5 -104
View File
@@ -132,8 +132,10 @@ def test_client(mock_jellyfin, mock_jellyseerr, mock_ssh):
app.dependency_overrides[get_jellyseerr_client] = lambda: mock_jellyseerr
app.dependency_overrides[get_ssh_client] = lambda: mock_ssh
app.dependency_overrides[get_user_id] = lambda: "user123"
client = TestClient(app)
yield client
auth_settings = SimpleNamespace(auth_enabled=False)
with patch("media_library_viewer_api.auth.get_settings", return_value=auth_settings):
client = TestClient(app)
yield client
app.dependency_overrides.clear()
@@ -245,107 +247,6 @@ class TestUsers:
assert response.json()["state"] == "idle"
assert response.json()["pending_count"] == 0
def test_users_message_test_smtp(self, test_client):
settings = SimpleNamespace(
smtp_host="smtp.fastmail.com",
smtp_port=587,
smtp_username="main@fastmail.com",
smtp_password="app-password",
smtp_from_address="alias@example.com",
smtp_from_name="Media Library Viewer",
smtp_use_tls=True,
smtp_use_ssl=False,
smtp_timeout=15,
)
app.dependency_overrides[get_mail_queue] = lambda: MagicMock()
try:
with patch("media_library_viewer_api.routers.users.get_settings", return_value=settings), patch(
"media_library_viewer_api.routers.users.test_smtp_connection",
return_value={
"status": "ok",
"message": "SMTP connection successful using Fastmail STARTTLS 587",
"from_address": "alias@example.com",
"from_name": "Media Library Viewer",
"smtp_host": "smtp.fastmail.com",
"smtp_port": 587,
"use_tls": True,
"use_ssl": False,
"authenticated": True,
"selected_mode": {
"label": "Fastmail STARTTLS 587",
"smtp_host": "smtp.fastmail.com",
"smtp_port": 587,
"use_tls": True,
"use_ssl": False,
},
"attempts": [
{
"label": "Fastmail STARTTLS 587",
"smtp_host": "smtp.fastmail.com",
"smtp_port": 587,
"use_tls": True,
"use_ssl": False,
"status": "ok",
}
],
},
):
response = test_client.post("/api/users/message/test-smtp")
finally:
app.dependency_overrides.pop(get_mail_queue, None)
assert response.status_code == 200
data = response.json()
assert data["status"] == "ok"
assert data["smtp_host"] == "smtp.fastmail.com"
assert data["selected_mode"]["label"] == "Fastmail STARTTLS 587"
def test_users_message_test_smtp_timeout_message(self, test_client):
settings = SimpleNamespace(
smtp_host="smtp.fastmail.com",
smtp_port=587,
smtp_username="main@fastmail.com",
smtp_password="app-password",
smtp_from_address="alias@example.com",
smtp_from_name="Media Library Viewer",
smtp_use_tls=True,
smtp_use_ssl=False,
smtp_timeout=15,
)
app.dependency_overrides[get_mail_queue] = lambda: MagicMock()
try:
with patch("media_library_viewer_api.routers.users.get_settings", return_value=settings), patch(
"media_library_viewer_api.routers.users.test_smtp_connection",
return_value={
"status": "error",
"message": "SMTP connection timed out while waiting for the server greeting. Check host, port, network access, and SMTP_TIMEOUT.",
"from_address": "alias@example.com",
"from_name": "Media Library Viewer",
"smtp_host": "smtp.fastmail.com",
"smtp_port": 587,
"use_tls": True,
"use_ssl": False,
"authenticated": True,
"selected_mode": None,
"attempts": [
{
"label": "configured",
"smtp_host": "smtp.fastmail.com",
"smtp_port": 587,
"use_tls": True,
"use_ssl": False,
"status": "failed",
"error": "SMTP connection timed out while waiting for the server greeting. Check host, port, network access, and SMTP_TIMEOUT.",
}
],
},
):
response = test_client.post("/api/users/message/test-smtp")
finally:
app.dependency_overrides.pop(get_mail_queue, None)
assert response.status_code == 200
assert response.json()["status"] == "error"
assert "timed out" in response.json()["message"].lower()
def test_users_message_is_queued(self, test_client):
mail_queue = MagicMock()
mail_queue.status.return_value = {
@@ -371,7 +272,7 @@ class TestUsers:
smtp_username="mailer@example.com",
smtp_password="secret",
smtp_from_address="mailer@example.com",
smtp_from_name="Media Library Viewer",
smtp_from_name="Manage",
smtp_use_tls=True,
smtp_use_ssl=False,
smtp_timeout=15,
backend/tests/test_mailer.py
+4 -66
View File
@@ -12,7 +12,6 @@ from media_library_viewer_api.services.mailer import (
describe_smtp_error,
html_to_text,
send_email_message,
test_smtp_connection as smtp_connection_probe,
)
@@ -41,7 +40,7 @@ class MailerTests(unittest.TestCase):
smtp_username="mailer@example.com",
smtp_password="secret",
smtp_from_address="mailer@example.com",
smtp_from_name="Media Library Viewer",
smtp_from_name="Manage",
smtp_use_tls=True,
smtp_use_ssl=False,
smtp_timeout=15,
@@ -67,70 +66,9 @@ class MailerTests(unittest.TestCase):
smtp.send_message.assert_called_once()
message = smtp.send_message.call_args.args[0]
self.assertEqual(message["Subject"], "Hello")
self.assertEqual(message["From"], "Media Library Viewer <mailer@example.com>")
self.assertEqual(message["From"], "Manage <mailer@example.com>")
self.assertEqual(result["recipient_count"], 2)
self.assertEqual(result["attachment_count"], 1)
def test_test_smtp_connection_uses_starttls_and_login(self) -> None:
settings = SimpleNamespace(
smtp_host="smtp.example.com",
smtp_port=587,
smtp_username="mailer@example.com",
smtp_password="secret",
smtp_from_address="alias@example.com",
smtp_from_name="Media Library Viewer",
smtp_use_tls=True,
smtp_use_ssl=False,
smtp_timeout=15,
)
smtp = MagicMock()
smtp_factory = MagicMock(return_value=_SMTPContext(smtp))
with patch("media_library_viewer_api.services.mailer.smtplib.SMTP", smtp_factory), patch(
"media_library_viewer_api.services.mailer.smtplib.SMTP_SSL"
) as smtp_ssl:
result = smtp_connection_probe(settings)
smtp_ssl.assert_not_called()
smtp.ehlo.assert_called()
smtp.starttls.assert_called_once()
smtp.login.assert_called_once_with("mailer@example.com", "secret")
smtp.noop.assert_called_once()
self.assertEqual(result["status"], "ok")
self.assertEqual(result["from_address"], "alias@example.com")
self.assertEqual(result["smtp_host"], "smtp.example.com")
self.assertEqual(result["selected_mode"]["label"], "configured")
def test_test_smtp_connection_falls_back_to_fastmail_mode(self) -> None:
settings = SimpleNamespace(
smtp_host="smtp.fastmail.com",
smtp_port=465,
smtp_username="mailer@example.com",
smtp_password="secret",
smtp_from_address="alias@example.com",
smtp_from_name="Media Library Viewer",
smtp_use_tls=False,
smtp_use_ssl=True,
smtp_timeout=15,
)
smtp_ssl = MagicMock(side_effect=TimeoutError("timed out"))
fallback_smtp = MagicMock()
smtp_factory = MagicMock(return_value=_SMTPContext(fallback_smtp))
with patch("media_library_viewer_api.services.mailer.smtplib.SMTP_SSL", smtp_ssl), patch(
"media_library_viewer_api.services.mailer.smtplib.SMTP",
smtp_factory,
):
result = smtp_connection_probe(settings)
self.assertEqual(result["status"], "ok")
self.assertEqual(result["selected_mode"]["label"], "Fastmail STARTTLS 587")
self.assertEqual(len(result["attempts"]), 2)
self.assertEqual(result["attempts"][0]["status"], "failed")
self.assertEqual(result["attempts"][1]["status"], "ok")
fallback_smtp.starttls.assert_called_once()
fallback_smtp.login.assert_called_once_with("mailer@example.com", "secret")
def test_send_email_message_falls_back_to_fastmail_mode(self) -> None:
settings = SimpleNamespace(
smtp_host="smtp.fastmail.com",
@@ -138,7 +76,7 @@ class MailerTests(unittest.TestCase):
smtp_username="mailer@example.com",
smtp_password="secret",
smtp_from_address="alias@example.com",
smtp_from_name="Media Library Viewer",
smtp_from_name="Manage",
smtp_use_tls=False,
smtp_use_ssl=True,
smtp_timeout=15,
@@ -172,7 +110,7 @@ class MailerTests(unittest.TestCase):
smtp_username="mailer@example.com",
smtp_password="secret",
smtp_from_address="alias@example.com",
smtp_from_name="Media Library Viewer",
smtp_from_name="Manage",
smtp_use_tls=True,
smtp_use_ssl=False,
smtp_timeout=15,