|
@@ -13,6 +13,7 @@ from cura.Settings.GlobalStack import GlobalStack #Testing for returning the cor
|
|
|
from UM.Resources import Resources #Mocking some functions of this.
|
|
|
import UM.Settings.ContainerRegistry #Making empty container stacks.
|
|
|
import UM.Settings.ContainerStack #Setting the container registry here properly.
|
|
|
+from UM.Settings.DefinitionContainer import DefinitionContainer
|
|
|
|
|
|
## Gives a fresh CuraContainerRegistry instance.
|
|
|
@pytest.fixture()
|
|
@@ -37,11 +38,15 @@ def test_loadTypes(filename, output_class, container_registry):
|
|
|
#Mock some dependencies.
|
|
|
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_instance" or id == "some_definition":
|
|
|
+
|
|
|
+ def findContainers(container_type = 0, id = None):
|
|
|
+ if id == "some_instance":
|
|
|
return [UM.Settings.ContainerRegistry._EmptyInstanceContainer(id)]
|
|
|
+ elif id == "some_definition":
|
|
|
+ return [DefinitionContainer(container_id = id)]
|
|
|
else:
|
|
|
return []
|
|
|
+
|
|
|
container_registry.findContainers = findContainers
|
|
|
|
|
|
with unittest.mock.patch("cura.Settings.GlobalStack.GlobalStack.findContainer"):
|