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

STAR-322: Fixing tests

Browse source
This commit is contained in:
Daniel Schiavini 2018-12-17 12:05:25 +01:00
parent 9eb743bcb8
commit 87c1392173
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@ from cura.CuraApplication import CuraApplication
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
from src.Cloud.CloudApiClient import CloudApiClient from src.Cloud.CloudApiClient import CloudApiClient
from src.Cloud.CloudOutputDevice import CloudOutputDevice from src.Cloud.CloudOutputDevice import CloudOutputDevice
from src.Cloud.Models.CloudClusterResponse import CloudClusterResponse
from tests.Cloud.Fixtures import readFixture, parseFixture from tests.Cloud.Fixtures import readFixture, parseFixture
from .NetworkManagerMock import NetworkManagerMock from .NetworkManagerMock import NetworkManagerMock
@ -18,6 +19,7 @@ class TestCloudOutputDevice(TestCase):
CLUSTER_ID = "RIZ6cZbWA_Ua7RZVJhrdVfVpf0z-MqaSHQE4v8aRTtYq" CLUSTER_ID = "RIZ6cZbWA_Ua7RZVJhrdVfVpf0z-MqaSHQE4v8aRTtYq"
JOB_ID = "ABCDefGHIjKlMNOpQrSTUvYxWZ0-1234567890abcDE=" JOB_ID = "ABCDefGHIjKlMNOpQrSTUvYxWZ0-1234567890abcDE="
HOST_NAME = "ultimakersystem-ccbdd30044ec" HOST_NAME = "ultimakersystem-ccbdd30044ec"
HOST_GUID = "e90ae0ac-1257-4403-91ee-a44c9b7e8050"
BASE_URL = "https://api-staging.ultimaker.com" BASE_URL = "https://api-staging.ultimaker.com"
STATUS_URL = "{}/connect/v1/clusters/{}/status".format(BASE_URL, CLUSTER_ID) STATUS_URL = "{}/connect/v1/clusters/{}/status".format(BASE_URL, CLUSTER_ID)
@ -29,13 +31,15 @@ class TestCloudOutputDevice(TestCase):
self.app = CuraApplication.getInstance() self.app = CuraApplication.getInstance()
self.backend = MagicMock(backendStateChange = Signal()) self.backend = MagicMock(backendStateChange = Signal())
self.app.setBackend(self.backend) self.app.setBackend(self.backend)
self.cluster = CloudClusterResponse(self.CLUSTER_ID, self.HOST_GUID, self.HOST_NAME, is_online=True,
status="active")
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("src.Cloud.CloudApiClient.QNetworkAccessManager", return_value = self.network): with patch("src.Cloud.CloudApiClient.QNetworkAccessManager", return_value = self.network):
self._api = CloudApiClient(self.account, self.onError) self._api = CloudApiClient(self.account, self.onError)
self.device = CloudOutputDevice(self._api, self.CLUSTER_ID, self.HOST_NAME) 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"))
@ -81,7 +85,7 @@ class TestCloudOutputDevice(TestCase):
self.cluster_status["data"]["print_jobs"].clear() self.cluster_status["data"]["print_jobs"].clear()
self.network.prepareReply("GET", self.STATUS_URL, 200, self.cluster_status) self.network.prepareReply("GET", self.STATUS_URL, 200, self.cluster_status)
self.device._last_response_time = None self.device._last_request_time = None
self.device._update() self.device._update()
self.network.flushReplies() self.network.flushReplies()
self.assertEqual([], self.device.printJobs) self.assertEqual([], self.device.printJobs)
@ -94,7 +98,7 @@ class TestCloudOutputDevice(TestCase):
self.cluster_status["data"]["printers"].clear() self.cluster_status["data"]["printers"].clear()
self.network.prepareReply("GET", self.STATUS_URL, 200, self.cluster_status) self.network.prepareReply("GET", self.STATUS_URL, 200, self.cluster_status)
self.device._last_response_time = None self.device._last_request_time = None
self.device._update() self.device._update()
self.network.flushReplies() self.network.flushReplies()
self.assertEqual([], self.device.printers) self.assertEqual([], self.device.printers)

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

@ -41,7 +41,7 @@ class TestCloudOutputDeviceManager(TestCase):
clusters = self.clusters_response.get("data", []) clusters = self.clusters_response.get("data", [])
self.assertEqual([CloudOutputDevice] * len(clusters), [type(d) for d in devices]) self.assertEqual([CloudOutputDevice] * len(clusters), [type(d) for d in devices])
self.assertEqual({cluster["cluster_id"] for cluster in clusters}, {device.key for device in devices}) self.assertEqual({cluster["cluster_id"] for cluster in clusters}, {device.key for device in devices})
self.assertEqual({cluster["host_name"] for cluster in clusters}, {device.host_name for device in devices}) self.assertEqual(clusters, [device.clusterData.toDict() for device in devices])
for device in clusters: for device in clusters:
device_manager.getOutputDevice(device["cluster_id"]).close() device_manager.getOutputDevice(device["cluster_id"]).close()