1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/901808e8e65e/ Changeset: 901808e8e65e User: Dave Bouvier Date: 2013-08-05 16:17:10 Summary: Fix issue where a tool shed functional test was failing. Only allow hours between check to be less than 1 when running functional tests. Affected #: 1 file diff -r 2060df75cb2817fa567853af141c11b53d1ea0da -r 901808e8e65eed49de6cb42f2cd1ebac0d5eabb8 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -76,21 +76,24 @@ self.tool_data_table_config_path = resolve_path( kwargs.get( 'tool_data_table_config_path', 'tool_data_table_conf.xml' ), self.root ) 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 ) ) + self.running_functional_tests = string_as_bool( kwargs.get( 'running_functional_tests', False ) ) self.hours_between_check = kwargs.get( 'hours_between_check', 12 ) try: - hbc_test = int( self.hours_between_check ) - self.hours_between_check = hbc_test - if self.hours_between_check < 1 or self.hours_between_check > 24: + if isinstance( self.hours_between_check, int ): + if self.hours_between_check < 1 or self.hours_between_check > 24: + self.hours_between_check = 12 + elif isinstance( self.hours_between_check, float ): + # If we're running functional tests, the minimum hours between check should be reduced to 0.001, or 3.6 seconds. + if self.running_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.0 or self.hours_between_check > 24.0: + self.hours_between_check = 12.0 + else: self.hours_between_check = 12 except: - try: - # Float values are supported for functional tests. - hbc_test = float( self.hours_between_check ) - self.hours_between_check = hbc_test - if self.hours_between_check < 0.001 or self.hours_between_check > 24.0: - self.hours_between_check = 12.0 - except: - self.hours_between_check = 12 + self.hours_between_check = 12 self.update_integrated_tool_panel = kwargs.get( "update_integrated_tool_panel", True ) self.enable_data_manager_user_view = string_as_bool( kwargs.get( "enable_data_manager_user_view", "False" ) ) self.data_manager_config_file = resolve_path( kwargs.get('data_manager_config_file', 'data_manager_conf.xml' ), self.root ) @@ -276,7 +279,6 @@ self.biostar_url = kwargs.get( 'biostar_url', None ) self.biostar_key_name = kwargs.get( 'biostar_key_name', None ) self.biostar_key = kwargs.get( 'biostar_key', None ) - self.running_functional_tests = string_as_bool( kwargs.get( 'running_functional_tests', False ) ) # Experimental: This will not be enabled by default and will hide # nonproduction code. # The api_folders refers to whether the API exposes the /folders section. Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.