diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py index 0be1d82141..36e03c6213 100644 --- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py +++ b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py @@ -28,7 +28,7 @@ class TestCloudApiClient(TestCase): self.account.isLoggedIn.return_value = True self.network = NetworkManagerMock() - with patch("plugins.UM3NetworkPrinting.src.Cloud.CloudApiClient.QNetworkAccessManager", return_value = self.network): + with patch("CloudApiClient.QNetworkAccessManager", return_value = self.network): self.api = CloudApiClient(self.account, self._errorHandler) def test_getClusters(self): diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py index 191b92bdd5..d9f983640e 100644 --- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py @@ -41,7 +41,7 @@ class TestCloudOutputDevice(TestCase): self.network = NetworkManagerMock() self.account = MagicMock(isLoggedIn=True, accessToken="TestAccessToken") self.onError = MagicMock() - with patch("plugins.UM3NetworkPrinting.src.Cloud.CloudApiClient.QNetworkAccessManager", + with patch("CloudApiClient.QNetworkAccessManager", return_value = self.network): self._api = CloudApiClient(self.account, self.onError) diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py index c5006f35a1..66acac8eff 100644 --- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py @@ -28,10 +28,8 @@ class TestCloudOutputDeviceManager(TestCase): self.network = NetworkManagerMock() self.timer = MagicMock(timeout = FakeSignal()) - with patch("plugins.UM3NetworkPrinting.src.Cloud.CloudApiClient.QNetworkAccessManager", - return_value = self.network), \ - patch("plugins.UM3NetworkPrinting.src.Cloud.CloudOutputDeviceManager.QTimer", - return_value = self.timer): + with patch("CloudApiClient.QNetworkAccessManager", return_value = self.network), \ + patch("CloudOutputDeviceManager.QTimer", return_value = self.timer): self.manager = CloudOutputDeviceManager() self.clusters_response = parseFixture("getClusters") self.network.prepareReply("GET", self.URL, 200, readFixture("getClusters")) @@ -114,7 +112,7 @@ class TestCloudOutputDeviceManager(TestCase): active_machine_mock.setMetaDataEntry.assert_called_with("um_cloud_cluster_id", cluster2["cluster_id"]) - @patch("plugins.UM3NetworkPrinting.src.Cloud.CloudOutputDeviceManager.Message") + @patch("CloudOutputDeviceManager.Message") def test_api_error(self, message_mock): self.clusters_response = { "errors": [{"id": "notFound", "title": "Not found!", "http_status": "404", "code": "notFound"}] diff --git a/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py b/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py index 6eac892af6..952d38dcf4 100644 --- a/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py +++ b/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py @@ -1,7 +1,6 @@ # Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -import copy import io import json from unittest import TestCase, mock @@ -14,7 +13,7 @@ from UM.Application import Application from cura.Machines.MaterialGroup import MaterialGroup from cura.Machines.MaterialNode import MaterialNode -from plugins.UM3NetworkPrinting.src.SendMaterialJob import SendMaterialJob +from ..src.SendMaterialJob import SendMaterialJob _FILES_MAP = {"generic_pla_white": "/materials/generic_pla_white.xml.fdm_material", "generic_pla_black": "/materials/generic_pla_black.xml.fdm_material",