Merge remote-tracking branch 'upstream/release_19.01' into release_19.05

galaxyproject · May 2, 2019 · 9bfb08f · 9bfb08f
2 parents 9bc0a0c + b2eb394
commit 9bfb08f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/lib/galaxy/web/stack/handlers.py b/lib/galaxy/web/stack/handlers.py
@@ -57,6 +57,7 @@ def _init_handlers(self, config_element):
                     log.error("Handler '%s' overlaps handler with the same name, ignoring", handler_id)
                 else:
                     log.debug("Read definition for handler '%s'", handler_id)
+                    self._parse_handler(handler_id, handler)
                     self.add_handler(
                         handler_id,
                         [x.strip() for x in handler.get('tags', self.DEFAULT_HANDLER_TAG).split(',')]

diff --git a/test/unit/jobs/test_job_configuration.py b/test/unit/jobs/test_job_configuration.py
@@ -230,6 +230,16 @@ def test_env_parsing(self):
 
         assert env_dest.env[3]["execute"] == "module load javastuff/2.10"
 
+    def test_handler_runner_plugins(self):
+        self.__with_advanced_config()
+        assert self.job_config.handler_runner_plugins["sge_handler"] == ["sge"]
+        assert "special_handler1" not in self.job_config.handler_runner_plugins
+
+    def test_resource_groups(self):
+        self.__with_advanced_config()
+        assert self.job_config.default_resource_group == "default"
+        assert self.job_config.resource_groups["memoryonly"] == ["memory"]
+
     def test_macro_expansion(self):
         self.__with_advanced_config()
         for name in ["foo_small", "foo_medium", "foo_large", "foo_longrunning"]: