3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Remove unnecessary patches in TestSendMaterialJob

Browse source 
CURA-6035
This commit is contained in:
Lipu Fei 2018-12-20 14:23:37 +01:00
parent e79f312fa0
commit 346d8d884e
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/UM3NetworkPrinting/tests/TestSendMaterialJob.py
View file

@ -166,15 +166,12 @@ class TestSendMaterialJob(TestCase):
self.assertEqual(0, device_mock.createFormPart.call_count) self.assertEqual(0, device_mock.createFormPart.call_count)
@patch("cura.Machines.MaterialManager") @patch("UM.Application.Application.getInstance")
@patch("cura.Settings.CuraContainerRegistry") def test__onGetRemoteMaterials_withNoUpdate(self, application_mock):
@patch("UM.Application")
def test__onGetRemoteMaterials_withNoUpdate(self, application_mock, container_registry_mock,
material_manager_mock):
reply_mock = MagicMock() reply_mock = MagicMock()
device_mock = MagicMock() device_mock = MagicMock()
application_mock.getContainerRegistry.return_value = container_registry_mock container_registry_mock = application_mock.getContainerRegistry.return_value
application_mock.getMaterialManager.return_value = material_manager_mock material_manager_mock = application_mock.getMaterialManager.return_value
device_mock.createFormPart.return_value = "_xXx_" device_mock.createFormPart.return_value = "_xXx_"
@ -217,15 +214,12 @@ class TestSendMaterialJob(TestCase):
call.postFormWithParts(target = "materials/", parts = ["_xXx_"], on_finished = job.sendingFinished)], call.postFormWithParts(target = "materials/", parts = ["_xXx_"], on_finished = job.sendingFinished)],
device_mock.method_calls) device_mock.method_calls)
@patch("cura.Machines.MaterialManager.MaterialManager") @patch("UM.Application.Application.getInstance")
@patch("cura.Settings.CuraContainerRegistry") def test__onGetRemoteMaterials_withNewMaterial(self, application_mock):
@patch("UM.Application")
def test__onGetRemoteMaterials_withNewMaterial(self, application_mock, container_registry_mock,
material_manager_mock):
reply_mock = MagicMock() reply_mock = MagicMock()
device_mock = MagicMock() device_mock = MagicMock()
application_mock.getContainerRegistry.return_value = container_registry_mock container_registry_mock = application_mock.getContainerRegistry.return_value
application_mock.getMaterialManager.return_value = material_manager_mock material_manager_mock = application_mock.getMaterialManager.return_value
container_registry_mock.getContainerFilePathById = lambda x: _FILES_MAP.get(x) container_registry_mock.getContainerFilePathById = lambda x: _FILES_MAP.get(x)