Ensure default_destination for each rule contains a destination for d…

…efault_priority
galaxyproject · Feb 9, 2018 · f4a2c55 · f4a2c55
1 parent c9867a8
commit f4a2c55
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/lib/galaxy/jobs/dynamic_tool_destination.py b/lib/galaxy/jobs/dynamic_tool_destination.py
@@ -949,14 +949,15 @@ def infinite_defaultdict():
                                 if ('priority' in curr['default_destination']
                                         and isinstance(curr['default_destination']['priority'], dict)):
 
-                                    ### May not be necessary check if something has all priorities specified as default
-                                    for priority in priority_list:
-                                        if priority not in curr['default_destination']['priority']:
-                                            error = ("No default for destination for priority '"
-                                                     + str(priority) + "' in '" + str(tool)) + "'."
-                                            if verbose:
-                                                log.debug(error)
-                                            valid_config = False
+                                    if new_config['default_priority'] not in curr['default_destination']['priority']:
+                                        error = ("Default priority '"
+                                                 + str(new_config['default_priority'])
+                                                 + "' does not appear in"
+                                                 + " default_destination for '"
+                                                 + str(tool) + "'.")
+                                        if verbose:
+                                            log.debug(error)
+                                        valid_config = False
 
                                     for priority in curr['default_destination']['priority']:
                                         destination = curr['default_destination']['priority'][priority]
@@ -1343,11 +1344,6 @@ def map_tool_to_destination(
     # For each different rule for the tool that's running
     fail_message = None
 
-    # assign default priority to the first element that comes out of the
-    # set. Definitely not the best way to pick fallback default
-    # destinations for tools, but there's not many other options without
-    # making default destinations a mandatory field for all tools
-
     if config is not None:
 
         if "default_destination" in config:

diff --git a/test/unit/jobs/dynamic_tool_destination/test_dynamic_tool_destination.py b/test/unit/jobs/dynamic_tool_destination/test_dynamic_tool_destination.py
@@ -665,8 +665,6 @@ def test_not_all_priorities_in_tool(self, l):
         l.check(
             ('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Running config validation...'),
             ('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "No default_priority section found in config. Setting 'med' as default priority."),
-            ('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "No default for destination for priority 'lowish' in 'yuck'."),
-            ('galaxy.jobs.dynamic_tool_destination', 'DEBUG', "No default for destination for priority 'higher' in 'yuck'."),
             ('galaxy.jobs.dynamic_tool_destination', 'DEBUG', 'Finished config validation.')
         )