Skip to content

Commit

Permalink
Fix broken collection_type_source tool and test.
Browse files Browse the repository at this point in the history
The tool wouldn't load after 8af243c 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
  • Loading branch information
jmchilton committed May 25, 2018
1 parent 5643707 commit 02feb17
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/galaxy/tools/parser/output_objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ def __init__(
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):
Expand Down

0 comments on commit 02feb17

Please sign in to comment.