3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 23:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch '4.0' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2019-01-17 14:44:42 +01:00
commit 2cd6f6a834
3 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/UM3NetworkPrinting/tests/Cloud/TestCloudApiClient.py
View file

@ -6,7 +6,7 @@ from unittest import TestCase
from unittest.mock import patch, MagicMock from unittest.mock import patch, MagicMock
from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot
from ...src.Cloud.CloudApiClient import CloudApiClient from ...src.Cloud import CloudApiClient
from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse
from ...src.Cloud.Models.CloudClusterStatus import CloudClusterStatus from ...src.Cloud.Models.CloudClusterStatus import CloudClusterStatus
from ...src.Cloud.Models.CloudPrintJobResponse import CloudPrintJobResponse from ...src.Cloud.Models.CloudPrintJobResponse import CloudPrintJobResponse
@ -15,9 +15,6 @@ from ...src.Cloud.Models.CloudError import CloudError
from .Fixtures import readFixture, parseFixture from .Fixtures import readFixture, parseFixture
from .NetworkManagerMock import NetworkManagerMock from .NetworkManagerMock import NetworkManagerMock
import pytest
pytestmark = pytest.mark.skip("Tests failing due to incorrect paths in patch")
class TestCloudApiClient(TestCase): class TestCloudApiClient(TestCase):
maxDiff = None maxDiff = None
@ -31,8 +28,8 @@ class TestCloudApiClient(TestCase):
self.account.isLoggedIn.return_value = True self.account.isLoggedIn.return_value = True
self.network = NetworkManagerMock() self.network = NetworkManagerMock()
with patch("CloudApiClient.QNetworkAccessManager", return_value = self.network): with patch.object(CloudApiClient, 'QNetworkAccessManager', return_value = self.network):
self.api = CloudApiClient(self.account, self._errorHandler) self.api = CloudApiClient.CloudApiClient(self.account, self._errorHandler)
def test_getClusters(self): def test_getClusters(self):
result = [] result = []

20
plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDevice.py
View file

@ -7,15 +7,12 @@ from unittest.mock import patch, MagicMock
from UM.Scene.SceneNode import SceneNode from UM.Scene.SceneNode import SceneNode
from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
from ...src.Cloud.CloudApiClient import CloudApiClient from ...src.Cloud import CloudApiClient
from ...src.Cloud.CloudOutputDevice import CloudOutputDevice from ...src.Cloud.CloudOutputDevice import CloudOutputDevice
from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse from ...src.Cloud.Models.CloudClusterResponse import CloudClusterResponse
from .Fixtures import readFixture, parseFixture from .Fixtures import readFixture, parseFixture
from .NetworkManagerMock import NetworkManagerMock from .NetworkManagerMock import NetworkManagerMock
import pytest
pytestmark = pytest.mark.skip("Tests failing due to incorrect paths in patch")
class TestCloudOutputDevice(TestCase): class TestCloudOutputDevice(TestCase):
maxDiff = None maxDiff = None
@ -44,19 +41,20 @@ class TestCloudOutputDevice(TestCase):
self.network = NetworkManagerMock() self.network = NetworkManagerMock()
self.account = MagicMock(isLoggedIn=True, accessToken="TestAccessToken") self.account = MagicMock(isLoggedIn=True, accessToken="TestAccessToken")
self.onError = MagicMock() self.onError = MagicMock()
with patch("CloudApiClient.QNetworkAccessManager", with patch.object(CloudApiClient, "QNetworkAccessManager", return_value = self.network):
return_value = self.network): self._api = CloudApiClient.CloudApiClient(self.account, self.onError)
self._api = CloudApiClient(self.account, self.onError)
self.device = CloudOutputDevice(self._api, self.cluster) self.device = CloudOutputDevice(self._api, self.cluster)
self.cluster_status = parseFixture("getClusterStatusResponse") self.cluster_status = parseFixture("getClusterStatusResponse")
self.network.prepareReply("GET", self.STATUS_URL, 200, readFixture("getClusterStatusResponse")) self.network.prepareReply("GET", self.STATUS_URL, 200, readFixture("getClusterStatusResponse"))
def tearDown(self): def tearDown(self):
super().tearDown() try:
self.network.flushReplies() super().tearDown()
for patched_method in self.patches: self.network.flushReplies()
patched_method.stop() finally:
for patched_method in self.patches:
patched_method.stop()
def test_status(self): def test_status(self):
self.device._update() self.device._update()

14
plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py
View file

@ -5,13 +5,11 @@ from unittest.mock import patch, MagicMock
from UM.OutputDevice.OutputDeviceManager import OutputDeviceManager from UM.OutputDevice.OutputDeviceManager import OutputDeviceManager
from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot from cura.UltimakerCloudAuthentication import CuraCloudAPIRoot
from ...src.Cloud.CloudOutputDeviceManager import CloudOutputDeviceManager from ...src.Cloud import CloudApiClient
from ...src.Cloud import CloudOutputDeviceManager
from .Fixtures import parseFixture, readFixture from .Fixtures import parseFixture, readFixture
from .NetworkManagerMock import NetworkManagerMock, FakeSignal from .NetworkManagerMock import NetworkManagerMock, FakeSignal
import pytest
pytestmark = pytest.mark.skip("Tests failing due to incorrect paths in patch")
class TestCloudOutputDeviceManager(TestCase): class TestCloudOutputDeviceManager(TestCase):
maxDiff = None maxDiff = None
@ -31,9 +29,9 @@ class TestCloudOutputDeviceManager(TestCase):
self.network = NetworkManagerMock() self.network = NetworkManagerMock()
self.timer = MagicMock(timeout = FakeSignal()) self.timer = MagicMock(timeout = FakeSignal())
with patch("CloudApiClient.QNetworkAccessManager", return_value = self.network), \ with patch.object(CloudApiClient, "QNetworkAccessManager", return_value = self.network), \
patch("CloudOutputDeviceManager.QTimer", return_value = self.timer): patch.object(CloudOutputDeviceManager, "QTimer", return_value = self.timer):
self.manager = CloudOutputDeviceManager() self.manager = CloudOutputDeviceManager.CloudOutputDeviceManager()
self.clusters_response = parseFixture("getClusters") self.clusters_response = parseFixture("getClusters")
self.network.prepareReply("GET", self.URL, 200, readFixture("getClusters")) self.network.prepareReply("GET", self.URL, 200, readFixture("getClusters"))
@ -115,7 +113,7 @@ class TestCloudOutputDeviceManager(TestCase):
active_machine_mock.setMetaDataEntry.assert_called_with("um_cloud_cluster_id", cluster2["cluster_id"]) active_machine_mock.setMetaDataEntry.assert_called_with("um_cloud_cluster_id", cluster2["cluster_id"])
@patch("CloudOutputDeviceManager.Message") @patch.object(CloudOutputDeviceManager, "Message")
def test_api_error(self, message_mock): def test_api_error(self, message_mock):
self.clusters_response = { self.clusters_response = {
"errors": [{"id": "notFound", "title": "Not found!", "http_status": "404", "code": "notFound"}] "errors": [{"id": "notFound", "title": "Not found!", "http_status": "404", "code": "notFound"}]