Update Signal alert handling

tests/test_signal_alert.py

@@ -4,25 +4,23 @@ from __future__ import annotations
 
 import json
 import socket
-from os import environ
 from typing import TYPE_CHECKING
 
-from python.signal_alert import signal_alert
+import pytest
+
+from python.signal_alert import SignalRPCError, signal_alert
 
 if TYPE_CHECKING:
     from pytest_mock import MockerFixture
 
 
 def test_signal_alert(mocker: MockerFixture) -> None:
-    environ["SIGNAL_ALERT_FROM_PHONE"] = "1234567890"
-    environ["SIGNAL_ALERT_TO_PHONE"] = "0987654321"
-
     mock_logger = mocker.patch("python.signal_alert.logger")
     mock_socket = mocker.patch("python.signal_alert.socket.socket")
     client = mock_socket.return_value.__enter__.return_value
     client.recv.side_effect = [b'{"jsonrpc":"2.0","result":{},"id":"signal-alert"}\n']
 
-    signal_alert("test")
+    assert signal_alert("test", "1234567890", "0987654321") is None
 
     mock_logger.info.assert_not_called()
     mock_socket.assert_called_once_with(socket.AF_UNIX, socket.SOCK_STREAM)
@@ -41,55 +39,31 @@ def test_signal_alert(mocker: MockerFixture) -> None:
     }
 
 
-def test_signal_alert_no_phones(mocker: MockerFixture) -> None:
-    environ.pop("SIGNAL_ALERT_FROM_PHONE", None)
-    environ.pop("SIGNAL_ALERT_TO_PHONE", None)
-    mock_logger = mocker.patch("python.signal_alert.logger")
-
-    signal_alert("test")
-
-    mock_logger.info.assert_called_once_with("SIGNAL_ALERT_FROM_PHONE or SIGNAL_ALERT_TO_PHONE not set")
-
-
 def test_signal_alert_socket_error(mocker: MockerFixture) -> None:
-    environ["SIGNAL_ALERT_FROM_PHONE"] = "1234567890"
-    environ["SIGNAL_ALERT_TO_PHONE"] = "0987654321"
-
-    mock_logger = mocker.patch("python.signal_alert.logger")
     mocker.patch("python.signal_alert.socket.socket", side_effect=ConnectionError("connection failed"))
 
-    signal_alert("test")
+    with pytest.raises(SignalRPCError, match="Signal RPC failed") as exc_info:
+        signal_alert("test", "1234567890", "0987654321")
 
-    mock_logger.exception.assert_called_once_with("Unable to communicate with signal-cli")
+    assert isinstance(exc_info.value.__cause__, ConnectionError)
 
 
 def test_signal_alert_rpc_error(mocker: MockerFixture) -> None:
-    environ["SIGNAL_ALERT_FROM_PHONE"] = "1234567890"
-    environ["SIGNAL_ALERT_TO_PHONE"] = "0987654321"
-
-    mock_logger = mocker.patch("python.signal_alert.logger")
     mock_socket = mocker.patch("python.signal_alert.socket.socket")
     client = mock_socket.return_value.__enter__.return_value
     client.recv.side_effect = [b'{"jsonrpc":"2.0","error":{"code":-1,"message":"failed"},"id":"signal-alert"}\n']
 
-    signal_alert("test")
-
-    mock_logger.error.assert_called_once_with(
-        "Signal RPC returned an error: %s",
-        {"code": -1, "message": "failed"},
-    )
+    with pytest.raises(SignalRPCError, match=r"Signal RPC returned an error:.*failed"):
+        signal_alert("test", "1234567890", "0987654321")
 
 
 def test_signal_alert_ignores_notifications(mocker: MockerFixture) -> None:
-    environ["SIGNAL_ALERT_FROM_PHONE"] = "1234567890"
-    environ["SIGNAL_ALERT_TO_PHONE"] = "0987654321"
-
     mock_socket = mocker.patch("python.signal_alert.socket.socket")
     client = mock_socket.return_value.__enter__.return_value
     client.recv.side_effect = [
         b'{"jsonrpc":"2.0","method":"receive"}\n{"jsonrpc":"2.0","result":{},"id":"signal-alert"}\n'
     ]
 
-    signal_alert("test")
+    assert signal_alert("test", "1234567890", "0987654321") is None
 
     assert client.recv.call_count == 1