From 02feb1735086c8aca9feff740139bdebc1bc91d5 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Fri, 25 May 2018 11:10:39 -0400 Subject: [PATCH] Fix broken collection_type_source tool and test. The tool wouldn't load after 8af243c176fd9c261277327750aaa71806add4ef and that caused the relevant tests to "SKIP" instead of failing outright. ./run_tests.sh -api test/api/test_tools.py:ToolsTestCase.test_map_over_collection_type_source --- lib/galaxy/tools/parser/output_objects.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/parser/output_objects.py b/lib/galaxy/tools/parser/output_objects.py index 216d5df60f5..89a711573ab 100644 --- a/lib/galaxy/tools/parser/output_objects.py +++ b/lib/galaxy/tools/parser/output_objects.py @@ -188,8 +188,8 @@ class ToolOutputCollectionStructure(object): raise ValueError("Cannot set both type and type_source on collection output.") if collection_type is None and structured_like is None and dataset_collector_descriptions is None and collection_type_source is None and collection_type_from_rules is None: raise ValueError("Output collection types must specify source of collection type information (e.g. structured_like or type_source).") - if dataset_collector_descriptions and (structured_like or collection_type_source or collection_type_from_rules): - raise ValueError("Cannot specify dynamic structure (discovered_datasets) and collection type source attributes such as structured_like or type_source.") + if dataset_collector_descriptions and (structured_like or collection_type_from_rules): + raise ValueError("Cannot specify dynamic structure (discovered_datasets) and collection type attributes structured_like or collection_type_from_rules.") self.dynamic = dataset_collector_descriptions is not None def collection_prototype(self, inputs, type_registry):