3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 08:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Simplify defaults for container IDs in fixtures

Browse source 
Contributes to issue CURA-3497.
This commit is contained in:
Ghostkeeper 2017-04-07 14:02:39 +02:00
parent 46f3b5bd97
commit 7ce89f5d80
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/Settings/TestGlobalStack.py
View file

@ -55,17 +55,14 @@ def container_registry():
registry.typeMetaData = "registry_mock" registry.typeMetaData = "registry_mock"
def findInstanceContainers(registry, **kwargs): def findInstanceContainers(registry, **kwargs):
if "id" not in kwargs: container_id = kwargs.get("id", default = "test_container")
return [MockContainer("test_container", registry.typeMetaData)] return [MockContainer(container_id, registry.typeMetaData)]
else:
return [MockContainer(id, registry.typeMetaData)]
registry.findInstanceContainers = functools.partial(findInstanceContainers, registry) registry.findInstanceContainers = functools.partial(findInstanceContainers, registry)
def findContainers(registry, container_type = None, id = None): def findContainers(registry, container_type = None, id = None):
if not id: if not id:
return [MockContainer("test_container", registry.typeMetaData)] id = "test_container"
else: return [MockContainer(id, registry.typeMetaData)]
return [MockContainer(id, registry.typeMetaData)]
registry.findContainers = functools.partial(findContainers, registry) registry.findContainers = functools.partial(findContainers, registry)
UM.Settings.ContainerRegistry.ContainerRegistry._ContainerRegistry__instance = registry UM.Settings.ContainerRegistry.ContainerRegistry._ContainerRegistry__instance = registry