From f6e54b49dbb2d479c4a4241e02be70e558f7da18 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 30 Apr 2019 19:45:43 -0400 Subject: [PATCH 1/4] Add job configuration test for resource groups and handler plugins. --- test/unit/jobs/test_job_configuration.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/unit/jobs/test_job_configuration.py b/test/unit/jobs/test_job_configuration.py index 226276c68be5..c5eb57bbb20d 100644 --- 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_hanlder_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"]: From 98fa693a7ccb90d93ba87c6dae042466c03fd841 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 1 May 2019 14:51:35 -0400 Subject: [PATCH 2/4] Fix bug preventing handler runner plugin handling. --- lib/galaxy/util/handlers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/galaxy/util/handlers.py b/lib/galaxy/util/handlers.py index 00f6faa773cd..6ef287bb5acf 100644 --- a/lib/galaxy/util/handlers.py +++ b/lib/galaxy/util/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(',')] From 175865740c02132b5a0e7264c7664e1e0c10b2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= Date: Thu, 2 May 2019 08:08:23 -0400 Subject: [PATCH 3/4] Update test/unit/jobs/test_job_configuration.py Co-Authored-By: jmchilton --- test/unit/jobs/test_job_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/jobs/test_job_configuration.py b/test/unit/jobs/test_job_configuration.py index c5eb57bbb20d..440f17e22537 100644 --- a/test/unit/jobs/test_job_configuration.py +++ b/test/unit/jobs/test_job_configuration.py @@ -230,7 +230,7 @@ def test_env_parsing(self): assert env_dest.env[3]["execute"] == "module load javastuff/2.10" - def test_hanlder_runner_plugins(self): + 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 From 9bc0a0cbe5c1c50f77b4d3ab1ee98e4db5b10a34 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 2 May 2019 08:27:04 -0400 Subject: [PATCH 4/4] Add file missing from #7694 --- .../embedded_pulsar_metadata_job_conf.xml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 test/integration/embedded_pulsar_metadata_job_conf.xml diff --git a/test/integration/embedded_pulsar_metadata_job_conf.xml b/test/integration/embedded_pulsar_metadata_job_conf.xml new file mode 100644 index 000000000000..42e5573f6f0c --- /dev/null +++ b/test/integration/embedded_pulsar_metadata_job_conf.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + true + copy + + + + + +