diff --git a/tests/Settings/TestCuraContainerRegistry.py b/tests/Settings/TestCuraContainerRegistry.py index 48b141886b..3ae6c8cca7 100644 --- a/tests/Settings/TestCuraContainerRegistry.py +++ b/tests/Settings/TestCuraContainerRegistry.py @@ -31,7 +31,7 @@ def test_loadTypes(filename, output_class, container_registry): UM.Settings.ContainerStack.setContainerRegistry(container_registry) Resources.getAllResourcesOfType = unittest.mock.MagicMock(return_value = [os.path.join(os.path.dirname(os.path.abspath(__file__)), "stacks", filename)]) #Return just this tested file. def findContainers(id, container_type = 0): - if id == "some_material" or id == "some_definition": + if id == "some_instance" or id == "some_definition": return [UM.Settings.ContainerRegistry._EmptyInstanceContainer(id)] else: return [] diff --git a/tests/Settings/TestGlobalStack.py b/tests/Settings/TestGlobalStack.py index d808edd6f1..277ae4bd43 100644 --- a/tests/Settings/TestGlobalStack.py +++ b/tests/Settings/TestGlobalStack.py @@ -22,7 +22,7 @@ def test_deserializeUserChanges(filename, user_changes_id): #Mock the loading of the instances. def findContainer(container_id = "*", container_type = None, type = None, category = "*"): - if id == "some_material": + if id == "some_instance": return UM.Settings.ContainerRegistry._EmptyInstanceContainer(id) if container_type == DefinitionContainer: return unittest.mock.MagicMock() diff --git a/tests/Settings/stacks/ExtruderLegacy.stack.cfg b/tests/Settings/stacks/ExtruderLegacy.stack.cfg index 91d5a79b49..e2cdd1c08c 100644 --- a/tests/Settings/stacks/ExtruderLegacy.stack.cfg +++ b/tests/Settings/stacks/ExtruderLegacy.stack.cfg @@ -7,5 +7,5 @@ id = ExtruderLegacy type = extruder [containers] -3 = some_material +3 = some_instance 6 = some_definition diff --git a/tests/Settings/stacks/Global.global.cfg b/tests/Settings/stacks/Global.global.cfg index 11ad8fa656..9034c1d0d0 100644 --- a/tests/Settings/stacks/Global.global.cfg +++ b/tests/Settings/stacks/Global.global.cfg @@ -4,5 +4,5 @@ name = Global id = Global [containers] -3 = some_material +3 = some_instance 6 = some_definition diff --git a/tests/Settings/stacks/Global.stack.cfg b/tests/Settings/stacks/Global.stack.cfg index 11ad8fa656..9034c1d0d0 100644 --- a/tests/Settings/stacks/Global.stack.cfg +++ b/tests/Settings/stacks/Global.stack.cfg @@ -4,5 +4,5 @@ name = Global id = Global [containers] -3 = some_material +3 = some_instance 6 = some_definition diff --git a/tests/Settings/stacks/Left.extruder.cfg b/tests/Settings/stacks/Left.extruder.cfg index 3abe869a0e..fcc9500659 100644 --- a/tests/Settings/stacks/Left.extruder.cfg +++ b/tests/Settings/stacks/Left.extruder.cfg @@ -4,5 +4,5 @@ name = Left id = Left [containers] -3 = some_material +3 = some_instance 6 = some_definition diff --git a/tests/Settings/stacks/MachineLegacy.stack.cfg b/tests/Settings/stacks/MachineLegacy.stack.cfg index 0f2e77a82e..147d63c596 100644 --- a/tests/Settings/stacks/MachineLegacy.stack.cfg +++ b/tests/Settings/stacks/MachineLegacy.stack.cfg @@ -7,5 +7,5 @@ id = MachineLegacy type = machine [containers] -3 = some_material +3 = some_instance 6 = some_definition \ No newline at end of file