3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Move findSomeContainers out to global function

Browse source 
This way we can re-use it for other tests.

Contributes to issue CURA-3497.
This commit is contained in:
Ghostkeeper 2017-03-22 16:48:58 +01:00
parent c14b3e4f2b
commit 9d9832f8e2
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/Settings/TestGlobalStack.py
View file

@ -22,6 +22,14 @@ def container_registry():
registry.findContainers = findContainers registry.findContainers = findContainers
return registry return registry
## Place-in function for findContainer that finds only containers that start
# with "some_".
def findSomeContainers(container_id = "*", container_type = None, type = None, category = "*"):
if container_id.startswith("some_"):
return UM.Settings.ContainerRegistry._EmptyInstanceContainer(container_id)
if container_type == DefinitionContainer:
return unittest.mock.MagicMock()
## Tests whether the user changes are being read properly from a global stack. ## Tests whether the user changes are being read properly from a global stack.
@pytest.mark.parametrize("filename, user_changes_id", [ @pytest.mark.parametrize("filename, user_changes_id", [
("Global.global.cfg", "empty"), ("Global.global.cfg", "empty"),
@ -36,12 +44,7 @@ def test_deserializeUserChanges(filename, user_changes_id, container_registry):
stack = cura.Settings.GlobalStack.GlobalStack("TestStack") stack = cura.Settings.GlobalStack.GlobalStack("TestStack")
#Mock the loading of the instances. #Mock the loading of the instances.
def findContainer(container_id = "*", container_type = None, type = None, category = "*"): stack.findContainer = findSomeContainers
if container_id.startswith("some_"):
return UM.Settings.ContainerRegistry._EmptyInstanceContainer(container_id)
if container_type == DefinitionContainer:
return unittest.mock.MagicMock()
stack.findContainer = findContainer
UM.Settings.ContainerStack._containerRegistry = container_registry #Always has all profiles you ask of. UM.Settings.ContainerStack._containerRegistry = container_registry #Always has all profiles you ask of.
stack.deserialize(serialized) stack.deserialize(serialized)