From 9ca108f0dc1b11ec0248ed0ec820f3db6942f5cc Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Mon, 2 Nov 2020 11:08:12 +0100 Subject: [PATCH 1/3] apply suggested fix see https://github.com/galaxyproject/galaxy/pull/10434#issuecomment-712259265 Co-authored-by: John Chilton --- lib/galaxy/tool_util/verify/interactor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tool_util/verify/interactor.py b/lib/galaxy/tool_util/verify/interactor.py index 88f0d375bb8..ed3b81d973e 100644 --- a/lib/galaxy/tool_util/verify/interactor.py +++ b/lib/galaxy/tool_util/verify/interactor.py @@ -1284,7 +1284,7 @@ class ToolTestDescription: self.error = processed_test_dict.get("error", False) self.exception = processed_test_dict.get("exception", None) - self.output_collections = map(TestCollectionOutputDef.from_dict, processed_test_dict.get("output_collections", [])) + self.output_collections = list(map(TestCollectionOutputDef.from_dict, processed_test_dict.get("output_collections", []))) self.command_line = processed_test_dict.get("command_line", None) self.command_version = processed_test_dict.get("command_version", None) self.stdout = processed_test_dict.get("stdout", None) From 4b3bcef03749f5b9d00950b1215635e5833d66cb Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Sun, 7 Feb 2021 17:30:06 +0100 Subject: [PATCH 2/3] fix linting problem --- lib/galaxy/tool_util/verify/interactor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tool_util/verify/interactor.py b/lib/galaxy/tool_util/verify/interactor.py index ed3b81d973e..90997a6cf5e 100644 --- a/lib/galaxy/tool_util/verify/interactor.py +++ b/lib/galaxy/tool_util/verify/interactor.py @@ -1284,7 +1284,7 @@ class ToolTestDescription: self.error = processed_test_dict.get("error", False) self.exception = processed_test_dict.get("exception", None) - self.output_collections = list(map(TestCollectionOutputDef.from_dict, processed_test_dict.get("output_collections", []))) + self.output_collections = list(map(TestCollectionOutputDef.from_dict, processed_test_dict.get("output_collections", []))) self.command_line = processed_test_dict.get("command_line", None) self.command_version = processed_test_dict.get("command_version", None) self.stdout = processed_test_dict.get("stdout", None) From 5acf808b49e86d1ef3439d8702d8e443d80b996f Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Sun, 7 Feb 2021 17:54:38 +0100 Subject: [PATCH 3/3] Apply suggestion from code review Co-authored-by: Marius van den Beek --- lib/galaxy/tool_util/verify/interactor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tool_util/verify/interactor.py b/lib/galaxy/tool_util/verify/interactor.py index 90997a6cf5e..8a18e1c55e7 100644 --- a/lib/galaxy/tool_util/verify/interactor.py +++ b/lib/galaxy/tool_util/verify/interactor.py @@ -1284,7 +1284,7 @@ class ToolTestDescription: self.error = processed_test_dict.get("error", False) self.exception = processed_test_dict.get("exception", None) - self.output_collections = list(map(TestCollectionOutputDef.from_dict, processed_test_dict.get("output_collections", []))) + self.output_collections = [TestCollectionOutputDef.from_dict(d) for d in processed_test_dict.get("output_collections", [])] self.command_line = processed_test_dict.get("command_line", None) self.command_version = processed_test_dict.get("command_version", None) self.stdout = processed_test_dict.get("stdout", None)