From 4581c1f1384dc4842faeb99a4a0355c375d4f55f Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 28 Mar 2019 16:20:01 +0100 Subject: [PATCH] Fix UM3NetworkPrinting test Contributes to CL-1266 --- .../UM3NetworkPrinting/tests/Cloud/Fixtures/getClusters.json | 2 ++ .../tests/Cloud/TestCloudOutputDeviceManager.py | 2 +- plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/getClusters.json b/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/getClusters.json index 5200e3b971..a749721518 100644 --- a/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/getClusters.json +++ b/plugins/UM3NetworkPrinting/tests/Cloud/Fixtures/getClusters.json @@ -4,6 +4,7 @@ "host_guid": "e90ae0ac-1257-4403-91ee-a44c9b7e8050", "host_name": "ultimakersystem-ccbdd30044ec", "host_version": "5.0.0.20170101", + "host_internal_ip": "", "is_online": true, "status": "active" }, { @@ -11,6 +12,7 @@ "host_guid": "e0ace90a-91ee-1257-4403-e8050a44c9b7", "host_name": "ultimakersystem-30044ecccbdd", "host_version": "5.1.2.20180807", + "host_internal_ip": "", "is_online": true, "status": "active" }] diff --git a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py index e24ca1694e..ff7c6b2b67 100644 --- a/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/tests/Cloud/TestCloudOutputDeviceManager.py @@ -97,7 +97,7 @@ class TestCloudOutputDeviceManager(TestCase): self.assertTrue(self.device_manager.getOutputDevice(cluster1["cluster_id"]).isConnected()) self.assertIsNone(self.device_manager.getOutputDevice(cluster2["cluster_id"])) - self.assertEquals([], active_machine_mock.setMetaDataEntry.mock_calls) + self.assertEqual([], active_machine_mock.setMetaDataEntry.mock_calls) def test_device_connects_by_network_key(self): active_machine_mock = self.app.getGlobalContainerStack.return_value diff --git a/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py b/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py index 952d38dcf4..2cab110861 100644 --- a/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py +++ b/plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py @@ -208,7 +208,7 @@ class TestSendMaterialJob(TestCase): self.assertEqual(1, device_mock.createFormPart.call_count) self.assertEqual(1, device_mock.postFormWithParts.call_count) - self.assertEquals( + self.assertEqual( [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) @@ -238,7 +238,7 @@ class TestSendMaterialJob(TestCase): self.assertEqual(1, device_mock.createFormPart.call_count) self.assertEqual(1, device_mock.postFormWithParts.call_count) - self.assertEquals( + self.assertEqual( [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)