From d2598a9a1ee4a7ec59dae8881c73fb6f1e41e20d Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Fri, 8 Mar 2013 09:14:23 -0500 Subject: [PATCH] Enhance the hours_between_check config setting to handle float values in addition to int values. This allows for functional tests to test the Galaxy update manager. --- lib/galaxy/config.py | 11 ++++++++--- lib/tool_shed/galaxy_install/update_manager.py | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index 96e1d8d91f4..69ddcb82237 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -69,9 +69,14 @@ class Configuration( object ): self.shed_tool_data_table_config = resolve_path( kwargs.get( 'shed_tool_data_table_config', 'shed_tool_data_table_conf.xml' ), self.root ) self.enable_tool_shed_check = string_as_bool( kwargs.get( 'enable_tool_shed_check', False ) ) try: - self.hours_between_check = int( kwargs.get( 'hours_between_check', 12 ) ) - if self.hours_between_check < 1 or self.hours_between_check > 24: - self.hours_between_check = 12 + self.hours_between_check = kwargs.get( 'hours_between_check', 12 ) + if isinstance( hours_between_check, float ): + # Float values are supported for functional tests. + if self.hours_between_check < 0.001 or self.hours_between_check > 24.0: + self.hours_between_check = 12.0 + else: + if self.hours_between_check < 1 or self.hours_between_check > 24: + self.hours_between_check = 12 except: self.hours_between_check = 12 self.update_integrated_tool_panel = kwargs.get( "update_integrated_tool_panel", True ) diff --git a/lib/tool_shed/galaxy_install/update_manager.py b/lib/tool_shed/galaxy_install/update_manager.py index 8f7d86112dc..b32c29e320e 100644 --- a/lib/tool_shed/galaxy_install/update_manager.py +++ b/lib/tool_shed/galaxy_install/update_manager.py @@ -18,7 +18,7 @@ class UpdateManager( object ): self.sleeper = Sleeper() self.restarter = threading.Thread( target=self.__restarter ) self.restarter.start() - self.seconds_to_sleep = app.config.hours_between_check * 3600 + self.seconds_to_sleep = int( app.config.hours_between_check * 3600 ) def __restarter( self ): log.info( 'Update manager restarter starting up...' ) while self.running: