mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-10 08:17:49 -06:00
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into 4.0
This commit is contained in:
commit
c6628560bb
3 changed files with 18 additions and 16 deletions
|
@ -5,7 +5,8 @@ from unittest.mock import patch, MagicMock
|
|||
|
||||
from UM.OutputDevice.OutputDeviceManager import OutputDeviceManager
|
||||
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 .NetworkManagerMock import NetworkManagerMock, FakeSignal
|
||||
|
||||
|
@ -31,9 +32,9 @@ class TestCloudOutputDeviceManager(TestCase):
|
|||
|
||||
self.network = NetworkManagerMock()
|
||||
self.timer = MagicMock(timeout = FakeSignal())
|
||||
with patch("CloudApiClient.QNetworkAccessManager", return_value = self.network), \
|
||||
patch("CloudOutputDeviceManager.QTimer", return_value = self.timer):
|
||||
self.manager = CloudOutputDeviceManager()
|
||||
with patch.object(CloudApiClient, "QNetworkAccessManager", return_value = self.network), \
|
||||
patch.object(CloudOutputDeviceManager, "QTimer", return_value = self.timer):
|
||||
self.manager = CloudOutputDeviceManager.CloudOutputDeviceManager()
|
||||
self.clusters_response = parseFixture("getClusters")
|
||||
self.network.prepareReply("GET", self.URL, 200, readFixture("getClusters"))
|
||||
|
||||
|
@ -115,7 +116,7 @@ class TestCloudOutputDeviceManager(TestCase):
|
|||
|
||||
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):
|
||||
self.clusters_response = {
|
||||
"errors": [{"id": "notFound", "title": "Not found!", "http_status": "404", "code": "notFound"}]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue