From 0e82c84790eea7752a284cea6b5953d31c75fead Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 12 Apr 2017 09:48:52 +0200 Subject: [PATCH] Let test_setVariantByIdExists 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 fff2283c93..db3b1a6716 100644 --- a/tests/Settings/TestExtruderStack.py +++ b/tests/Settings/TestExtruderStack.py @@ -402,15 +402,10 @@ def test_setQualityChangesByIdDoesntExist(extruder_stack): extruder_stack.setQualityChangesById("some_quality_changes") #Container registry is empty now. ## Tests setting variants by specifying an ID of a variant that exists. -@pytest.mark.skip def test_setVariantByIdExists(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.setVariantById("some_variant") #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 = "variant") + extruder_stack.setVariantById("InstanceContainer") + assert extruder_stack.variant.getId() == "InstanceContainer" ## Tests setting variants by specifying an ID of a variant that doesn't exist. @pytest.mark.skip