Fix existing tests, add new unit tests to test local delete.

tests/gui/test_widgets.py

@@ -5070,7 +5070,9 @@ def test_ReplyBoxWidget_enable_after_source_gets_key(mocker, session, session_ma
 
     # now simulate a sync...
     source_with_key = factory.RemoteSource(uuid=source.uuid)
-    storage.update_sources([source_with_key], [source], session, homedir)
+
+    # passing 'None' for skip_uuid, test that separately
+    storage.update_sources([source_with_key], [source], None, session, homedir)
 
     # ... simulate the ReplyBoxWidget receiving the sync success signal
     rbw._on_sync_succeeded()

tests/test_logic.py

@@ -1874,9 +1874,16 @@ def test_Controller_on_delete_conversation_success(mocker, homedir):
     info_logger = mocker.patch("securedrop_client.logic.logger.info")
 
     co = Controller("http://localhost", mocker.MagicMock(), mocker.MagicMock(), homedir)
+    mock_storage = mocker.MagicMock()
+    mocker.patch("securedrop_client.logic.storage", mock_storage)
+
     co.on_delete_conversation_success("uuid-blah")
+
     info_logger.assert_called_once_with(
-        "Conversation %s successfully deleted at server", "uuid-blah"
+        "Conversation %s successfully scheduled for deletion at server", "uuid-blah"
+    )
+    mock_storage.delete_local_conversation_by_source_uuid.assert_called_once_with(
+        co.session, "uuid-blah", co.data_dir
     )
 
 

tests/test_models.py

@@ -3,6 +3,7 @@
 import pytest
 
 from securedrop_client.db import (
+    DeletedConversation,
     DownloadError,
     DownloadErrorCodes,
     DraftReply,
@@ -349,3 +350,11 @@ def test_reply_with_download_error(session, download_error_codes):
 
     classname = r.__class__.__name__.lower()
     assert str(r) == f"cannot decrypt {classname}"
+
+
+def test_deletedconversation_creation(session):
+    with pytest.raises(TypeError):
+        DeletedConversation()  # must initialize with a UUID
+
+    dc = DeletedConversation(uuid="test-uuid")
+    assert str(dc) == "DeletedConversation (source {})".format(dc.uuid)