From a3346e2fb7c8cc4d800684f36bb3ca5ae82ced72 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 20 Nov 2017 23:39:19 -0500 Subject: [PATCH] Fix unit tests --- lib/galaxy/jobs/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py index 1bd5d827d12..58f393eab03 100644 --- a/lib/galaxy/jobs/__init__.py +++ b/lib/galaxy/jobs/__init__.py @@ -217,8 +217,13 @@ class JobConfiguration(object, ConfiguresHandlers): self.default_handler_id = self._get_default(self.app.config, handlers_conf, list(self.handlers.keys())) except Exception: pass + # For tets, this may not exist + try: + base_server_name = self.app.config.base_server_name + except AttributeError: + base_server_name = self.app.config.get('base_server_name', None) if (self.default_handler_id is None - or (len(self.handlers) == 1 and self.app.config.base_server_name == self.handlers.keys()[0])): + or (len(self.handlers) == 1 and base_server_name == self.handlers.keys()[0])): # Shortcut for compatibility with existing job confs that use the default handlers block, # there are no defined handlers, or there's only one handler and it's this server self.__set_default_job_handler()