diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py
index a09894deb0..49d2b1b34b 100644
--- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py
+++ b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py
@@ -54,10 +54,8 @@ class TestCloudApiClient(TestCase):
response = readFixture("getClusterStatusResponse")
data = parseFixture("getClusterStatusResponse")["data"]
- self.network.prepareReply("GET",
- CuraCloudAPIRoot + "/connect/v1/clusters/R0YcLJwar1ugh0ikEZsZs8NWKV6vJP_LdYsXgXqAcaNC/status",
- 200, response
- )
+ url = CuraCloudAPIRoot + "/connect/v1/clusters/R0YcLJwar1ugh0ikEZsZs8NWKV6vJP_LdYsXgXqAcaNC/status"
+ self.network.prepareReply("GET", url, 200, response)
self.api.getClusterStatus("R0YcLJwar1ugh0ikEZsZs8NWKV6vJP_LdYsXgXqAcaNC", lambda s: result.append(s))
self.network.flushReplies()
diff --git a/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py b/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py
deleted file mode 100644
index 7db5ebdedf..0000000000
--- a/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright (c) 2018 Ultimaker B.V.
-# Copyright (c) 2018 Ultimaker B.V.
-# Cura is released under the terms of the LGPLv3 or higher.
-import io
-import json
-from unittest import TestCase, mock
-from unittest.mock import patch, call
-
-from PyQt5.QtCore import QByteArray
-
-from UM.MimeTypeDatabase import MimeType
-from UM.Application import Application
-from src.SendMaterialJob import SendMaterialJob
-
-
-@patch("builtins.open", lambda _, __: io.StringIO(""))
-@patch("UM.MimeTypeDatabase.MimeTypeDatabase.getMimeTypeForFile",
- lambda _: MimeType(name = "application/x-ultimaker-material-profile", comment = "Ultimaker Material Profile",
- suffixes = ["xml.fdm_material"]))
-@patch("UM.Resources.Resources.getAllResourcesOfType", lambda _: ["/materials/generic_pla_white.xml.fdm_material"])
-@patch("plugins.UM3NetworkPrinting.src.ClusterUM3OutputDevice")
-@patch("PyQt5.QtNetwork.QNetworkReply")
-class TestSendMaterialJob(TestCase):
- _LOCAL_MATERIAL_WHITE = {"type": "material", "status": "unknown", "id": "generic_pla_white",
- "base_file": "generic_pla_white", "setting_version": "5", "name": "White PLA",
- "brand": "Generic", "material": "PLA", "color_name": "White",
- "GUID": "badb0ee7-87c8-4f3f-9398-938587b67dce", "version": "1", "color_code": "#ffffff",
- "description": "Test PLA White", "adhesion_info": "Use glue.", "approximate_diameter": "3",
- "properties": {"density": "1.00", "diameter": "2.85", "weight": "750"},
- "definition": "fdmprinter", "compatible": True}
-
- _LOCAL_MATERIAL_BLACK = {"type": "material", "status": "unknown", "id": "generic_pla_black",
- "base_file": "generic_pla_black", "setting_version": "5", "name": "Yellow CPE",
- "brand": "Ultimaker", "material": "CPE", "color_name": "Black",
- "GUID": "5fbb362a-41f9-4818-bb43-15ea6df34aa4", "version": "1", "color_code": "#000000",
- "description": "Test PLA Black", "adhesion_info": "Use glue.", "approximate_diameter": "3",
- "properties": {"density": "1.01", "diameter": "2.85", "weight": "750"},
- "definition": "fdmprinter", "compatible": True}
-
- _REMOTE_MATERIAL_WHITE = {
- "guid": "badb0ee7-87c8-4f3f-9398-938587b67dce",
- "material": "PLA",
- "brand": "Generic",
- "version": 1,
- "color": "White",
- "density": 1.00
- }
-
- _REMOTE_MATERIAL_BLACK = {
- "guid": "5fbb362a-41f9-4818-bb43-15ea6df34aa4",
- "material": "PLA",
- "brand": "Generic",
- "version": 2,
- "color": "Black",
- "density": 1.00
- }
-
- def test_run(self, device_mock, reply_mock):
- job = SendMaterialJob(device_mock)
- job.run()
-
- # We expect the materials endpoint to be called when the job runs.
- device_mock.get.assert_called_with("materials/", on_finished = job._onGetRemoteMaterials)
-
- def test__onGetRemoteMaterials_withFailedRequest(self, reply_mock, device_mock):
- reply_mock.attribute.return_value = 404
- job = SendMaterialJob(device_mock)
- job._onGetRemoteMaterials(reply_mock)
-
- # We expect the device not to be called for any follow up.
- self.assertEqual(0, device_mock.createFormPart.call_count)
-
- def test__onGetRemoteMaterials_withWrongEncoding(self, reply_mock, device_mock):
- reply_mock.attribute.return_value = 200
- reply_mock.readAll.return_value = QByteArray(json.dumps([self._REMOTE_MATERIAL_WHITE]).encode("cp500"))
- job = SendMaterialJob(device_mock)
- job._onGetRemoteMaterials(reply_mock)
-
- # Given that the parsing fails we do no expect the device to be called for any follow up.
- self.assertEqual(0, device_mock.createFormPart.call_count)
-
- def test__onGetRemoteMaterials_withBadJsonAnswer(self, reply_mock, device_mock):
- reply_mock.attribute.return_value = 200
- reply_mock.readAll.return_value = QByteArray(b"Six sick hicks nick six slick bricks with picks and sticks.")
- job = SendMaterialJob(device_mock)
- job._onGetRemoteMaterials(reply_mock)
-
- # Given that the parsing fails we do no expect the device to be called for any follow up.
- self.assertEqual(0, device_mock.createFormPart.call_count)
-
- def test__onGetRemoteMaterials_withMissingGuidInRemoteMaterial(self, reply_mock, device_mock):
- reply_mock.attribute.return_value = 200
- remote_material_without_guid = self._REMOTE_MATERIAL_WHITE.copy()
- del remote_material_without_guid["guid"]
- reply_mock.readAll.return_value = QByteArray(json.dumps([remote_material_without_guid]).encode("ascii"))
- job = SendMaterialJob(device_mock)
- job._onGetRemoteMaterials(reply_mock)
-
- # Given that parsing fails we do not expect the device to be called for any follow up.
- self.assertEqual(0, device_mock.createFormPart.call_count)
-
- @patch("cura.Settings.CuraContainerRegistry")
- @patch("UM.Application")
- def test__onGetRemoteMaterials_withInvalidVersionInLocalMaterial(self, application_mock, container_registry_mock,
- reply_mock, device_mock):
- reply_mock.attribute.return_value = 200
- reply_mock.readAll.return_value = QByteArray(json.dumps([self._REMOTE_MATERIAL_WHITE]).encode("ascii"))
-
- localMaterialWhiteWithInvalidVersion = self._LOCAL_MATERIAL_WHITE.copy()
- localMaterialWhiteWithInvalidVersion["version"] = "one"
- container_registry_mock.findContainersMetadata.return_value = [localMaterialWhiteWithInvalidVersion]
-
- application_mock.getContainerRegistry.return_value = container_registry_mock
-
- with mock.patch.object(Application, "getInstance", new = lambda: application_mock):
- job = SendMaterialJob(device_mock)
- job._onGetRemoteMaterials(reply_mock)
-
- self.assertEqual(0, device_mock.createFormPart.call_count)
-
- @patch("cura.Settings.CuraContainerRegistry")
- @patch("UM.Application")
- def test__onGetRemoteMaterials_withNoUpdate(self, application_mock, container_registry_mock, reply_mock,
- device_mock):
- application_mock.getContainerRegistry.return_value = container_registry_mock
-
- device_mock.createFormPart.return_value = "_xXx_"
-
- container_registry_mock.findContainersMetadata.return_value = [self._LOCAL_MATERIAL_WHITE]
-
- reply_mock.attribute.return_value = 200
- reply_mock.readAll.return_value = QByteArray(json.dumps([self._REMOTE_MATERIAL_WHITE]).encode("ascii"))
-
- with mock.patch.object(Application, "getInstance", new = lambda: application_mock):
- job = SendMaterialJob(device_mock)
- job._onGetRemoteMaterials(reply_mock)
-
- self.assertEqual(0, device_mock.createFormPart.call_count)
- self.assertEqual(0, device_mock.postFormWithParts.call_count)
-
- @patch("cura.Settings.CuraContainerRegistry")
- @patch("UM.Application")
- def test__onGetRemoteMaterials_withUpdatedMaterial(self, application_mock, container_registry_mock, reply_mock,
- device_mock):
- application_mock.getContainerRegistry.return_value = container_registry_mock
-
- device_mock.createFormPart.return_value = "_xXx_"
-
- localMaterialWhiteWithHigherVersion = self._LOCAL_MATERIAL_WHITE.copy()
- localMaterialWhiteWithHigherVersion["version"] = "2"
- container_registry_mock.findContainersMetadata.return_value = [localMaterialWhiteWithHigherVersion]
-
- reply_mock.attribute.return_value = 200
- reply_mock.readAll.return_value = QByteArray(json.dumps([self._REMOTE_MATERIAL_WHITE]).encode("ascii"))
-
- with mock.patch.object(Application, "getInstance", new = lambda: application_mock):
- job = SendMaterialJob(device_mock)
- job._onGetRemoteMaterials(reply_mock)
-
- self.assertEqual(1, device_mock.createFormPart.call_count)
- self.assertEqual(1, device_mock.postFormWithParts.call_count)
- self.assertEquals(
- [call.createFormPart("name=\"file\"; filename=\"generic_pla_white.xml.fdm_material\"", ""),
- call.postFormWithParts(target = "materials/", parts = ["_xXx_"], on_finished = job.sendingFinished)],
- device_mock.method_calls)
-
- @patch("cura.Settings.CuraContainerRegistry")
- @patch("UM.Application")
- def test__onGetRemoteMaterials_withNewMaterial(self, application_mock, container_registry_mock, reply_mock,
- device_mock):
- application_mock.getContainerRegistry.return_value = container_registry_mock
-
- device_mock.createFormPart.return_value = "_xXx_"
-
- container_registry_mock.findContainersMetadata.return_value = [self._LOCAL_MATERIAL_WHITE,
- self._LOCAL_MATERIAL_BLACK]
-
- reply_mock.attribute.return_value = 200
- reply_mock.readAll.return_value = QByteArray(json.dumps([self._REMOTE_MATERIAL_BLACK]).encode("ascii"))
-
- with mock.patch.object(Application, "getInstance", new = lambda: application_mock):
- job = SendMaterialJob(device_mock)
- job._onGetRemoteMaterials(reply_mock)
-
- self.assertEqual(1, device_mock.createFormPart.call_count)
- self.assertEqual(1, device_mock.postFormWithParts.call_count)
- self.assertEquals(
- [call.createFormPart("name=\"file\"; filename=\"generic_pla_white.xml.fdm_material\"", ""),
- call.postFormWithParts(target = "materials/", parts = ["_xXx_"], on_finished = job.sendingFinished)],
- device_mock.method_calls)
diff --git a/plugins/UM3NetworkPrinting/tests/__init__.py b/plugins/UM3NetworkPrinting/tests/__init__.py
new file mode 100644
index 0000000000..f3f6970c54
--- /dev/null
+++ b/plugins/UM3NetworkPrinting/tests/__init__.py
@@ -0,0 +1,2 @@
+# Copyright (c) 2018 Ultimaker B.V.
+# Cura is released under the terms of the LGPLv3 or higher.
diff --git a/run_mypy.py b/run_mypy.py
index 27f07cd281..2073f0e9a7 100644
--- a/run_mypy.py
+++ b/run_mypy.py
@@ -29,6 +29,7 @@ def where(exe_name: str, search_path: str = os.getenv("PATH")) -> str:
def findModules(path):
+ return ["UM3NetworkPrinting"]
result = []
for entry in os.scandir(path):
if entry.is_dir() and os.path.exists(os.path.join(path, entry.name, "__init__.py")):