From aef8946fc4f9a39d626b31ac658128e12fbd6e56 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 22055d75286..d71184efebf 100644 --- a/lib/galaxy/tool_util/verify/interactor.py +++ b/lib/galaxy/tool_util/verify/interactor.py @@ -1290,7 +1290,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 4a7e13633d716eda1eb11e17c81ac4e904b8899b 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 d71184efebf..4be21602e09 100644 --- a/lib/galaxy/tool_util/verify/interactor.py +++ b/lib/galaxy/tool_util/verify/interactor.py @@ -1290,7 +1290,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 d83b1c2eb1b3225642770fa0f46dbac312f48c87 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 4be21602e09..d056de058b2 100644 --- a/lib/galaxy/tool_util/verify/interactor.py +++ b/lib/galaxy/tool_util/verify/interactor.py @@ -1290,7 +1290,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)