STAR-322: Using QNetworkReply.finished signal instead of QNetworkAccessManager.finished

plugins/UM3NetworkPrinting/tests/Cloud/NetworkManagerMock.py

@@ -4,12 +4,27 @@ import json
 from typing import Dict, Tuple, Union, Optional
 from unittest.mock import MagicMock
 
-from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkReply, QNetworkRequest
+from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest
 
 from UM.Logger import Logger
 from UM.Signal import Signal
 
 
+class FakeSignal:
+    def __init__(self):
+        self._callbacks = []
+
+    def connect(self, callback):
+        self._callbacks.append(callback)
+
+    def disconnect(self, callback):
+        self._callbacks.remove(callback)
+
+    def emit(self, *args, **kwargs):
+        for callback in self._callbacks:
+            callback(*args, **kwargs)
+
+
 ## This class can be used to mock the QNetworkManager class and test the code using it.
 #  After patching the QNetworkManager class, requests are prepared before they can be executed.
 #  Any requests not prepared beforehand will cause KeyErrors.
@@ -27,7 +42,7 @@ class NetworkManagerMock:
     ## Initializes the network manager mock.
     def __init__(self) -> None:
         # a dict with the prepared replies, using the format {(http_method, url): reply}
-        self.replies = {}  # type: Dict[Tuple[str, str], QNetworkReply]
+        self.replies = {}  # type: Dict[Tuple[str, str], MagicMock]
         self.request_bodies = {}  # type: Dict[Tuple[str, str], bytes]
 
         # signals used in the network manager.
@@ -64,6 +79,8 @@ class NetworkManagerMock:
         reply_mock.url().toString.return_value = url
         reply_mock.operation.return_value = self._OPERATIONS[method]
         reply_mock.attribute.return_value = status_code
+        reply_mock.finished = FakeSignal()
+        reply_mock.isFinished.return_value = False
         reply_mock.readAll.return_value = response if isinstance(response, bytes) else json.dumps(response).encode()
         self.replies[method, url] = reply_mock
         Logger.log("i", "Prepared mock {}-response to {} {}", status_code, method, url)
@@ -78,6 +95,8 @@ class NetworkManagerMock:
     def flushReplies(self) -> None:
         for key, reply in self.replies.items():
             Logger.log("i", "Flushing reply to {} {}", *key)
+            reply.isFinished.return_value = True
+            reply.finished.emit()
             self.finished.emit(reply)
         self.reset()