From 7ce89f5d80c6f0ff934e83409d2d8fd4539822c5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 7 Apr 2017 14:02:39 +0200 Subject: [PATCH] Simplify defaults for container IDs in fixtures Contributes to issue CURA-3497. --- tests/Settings/TestGlobalStack.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/Settings/TestGlobalStack.py b/tests/Settings/TestGlobalStack.py index 89816ed678..45e54137e1 100644 --- a/tests/Settings/TestGlobalStack.py +++ b/tests/Settings/TestGlobalStack.py @@ -55,17 +55,14 @@ def container_registry(): registry.typeMetaData = "registry_mock" def findInstanceContainers(registry, **kwargs): - if "id" not in kwargs: - return [MockContainer("test_container", registry.typeMetaData)] - else: - return [MockContainer(id, registry.typeMetaData)] + container_id = kwargs.get("id", default = "test_container") + return [MockContainer(container_id, registry.typeMetaData)] registry.findInstanceContainers = functools.partial(findInstanceContainers, registry) def findContainers(registry, container_type = None, id = None): if not id: - return [MockContainer("test_container", registry.typeMetaData)] - else: - return [MockContainer(id, registry.typeMetaData)] + id = "test_container" + return [MockContainer(id, registry.typeMetaData)] registry.findContainers = functools.partial(findContainers, registry) UM.Settings.ContainerRegistry.ContainerRegistry._ContainerRegistry__instance = registry