52 lines
2.5 KiB
Diff
52 lines
2.5 KiB
Diff
From 4c94d254d7171d1d7df872eb2b5ea167861c6fc5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
|
Date: Sun, 10 Dec 2017 13:37:58 +0100
|
|
Subject: [PATCH] Fix failing test suite after 435285e
|
|
|
|
Fixes https://github.com/Ultimaker/Uranium/issues/319
|
|
---
|
|
tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py | 2 +-
|
|
tests/Settings/TestContainerRegistry.py | 2 +-
|
|
tests/Settings/TestContainerStack.py | 3 ++-
|
|
3 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py b/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py
|
|
index 9af8e697b..bac029a89 100644
|
|
--- a/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py
|
|
+++ b/tests/Settings/ContainerTestPlugin/ContainerTestPlugin.py
|
|
@@ -83,7 +83,7 @@ def serialize(self, ignored_metadata_keys=[]):
|
|
## Deserializes the container from a string representation.
|
|
#
|
|
# This method is not implemented in the mock container.
|
|
- def deserialize(self, serialized):
|
|
+ def deserialize(self, serialized, file_name=None):
|
|
raise NotImplementedError()
|
|
|
|
def getConfigurationTypeFromSerialized(self, serialized):
|
|
diff --git a/tests/Settings/TestContainerRegistry.py b/tests/Settings/TestContainerRegistry.py
|
|
index c7b6d7b0a..8daf837ae 100644
|
|
--- a/tests/Settings/TestContainerRegistry.py
|
|
+++ b/tests/Settings/TestContainerRegistry.py
|
|
@@ -107,7 +107,7 @@ def serialize(self, ignored_metadata_keys = None):
|
|
## Deserializes the container from a string representation.
|
|
#
|
|
# This method is not implemented in the mock container.
|
|
- def deserialize(self, serialized):
|
|
+ def deserialize(self, serialized, file_name=None):
|
|
raise NotImplementedError()
|
|
|
|
def getConfigurationTypeFromSerialized(self, serialized):
|
|
diff --git a/tests/Settings/TestContainerStack.py b/tests/Settings/TestContainerStack.py
|
|
index 269f74174..4c10d944a 100644
|
|
--- a/tests/Settings/TestContainerStack.py
|
|
+++ b/tests/Settings/TestContainerStack.py
|
|
@@ -106,7 +106,8 @@ def serialize(self, ignored_metadata_keys = None):
|
|
# creates different instances (which is desired).
|
|
#
|
|
# \param serialized A serialised mock container.
|
|
- def deserialize(self, serialized):
|
|
+ # \param file_name Unused param to match actual signatures.
|
|
+ def deserialize(self, serialized, file_name=None):
|
|
self._id = int(serialized)
|
|
|
|
def getConfigurationTypeFromSerialized(self, serialized):
|