From 27f053ad7b036c7dbf60908da119946d9924e7df Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 12 Apr 2017 09:44:28 +0200 Subject: [PATCH] Let test_setMaterialByIdExists use new container registry functionality It sets the container it expects beforehand and tests for its ID. Contributes to issue CURA-3497. --- tests/Settings/TestExtruderStack.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/Settings/TestExtruderStack.py b/tests/Settings/TestExtruderStack.py index 6360f2e313..db26e693a6 100644 --- a/tests/Settings/TestExtruderStack.py +++ b/tests/Settings/TestExtruderStack.py @@ -321,15 +321,10 @@ def test_setDefinitionByIdDoesntExist(extruder_stack): extruder_stack.setDefinitionById("some_definition") #Container registry is empty now. ## Tests setting materials by specifying an ID of a material that exists. -@pytest.mark.skip def test_setMaterialByIdExists(extruder_stack, container_registry): - original_container_registry = UM.Settings.ContainerStack._containerRegistry - UM.Settings.ContainerStack._containerRegistry = container_registry #Always has all the profiles you ask of. - - extruder_stack.setMaterialById("some_material") #The container registry always has a container with the ID. - - #Restore. - UM.Settings.ContainerStack._containerRegistry = original_container_registry + container_registry.return_value = getInstanceContainer(container_type = "material") + extruder_stack.setMaterialById("InstanceContainer") + assert extruder_stack.material.getId() == "InstanceContainer" ## Tests setting materials by specifying an ID of a material that doesn't # exist.