From 0d5833ed9133ff629423143db9c810051f3abf45 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 19 Mar 2021 06:40:04 +0100 Subject: [PATCH] Use OperationalException for TimeRange errors --- freqtrade/configuration/timerange.py | 7 +++++-- tests/test_timerange.py | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/freqtrade/configuration/timerange.py b/freqtrade/configuration/timerange.py index 2075b38c6..6072e296c 100644 --- a/freqtrade/configuration/timerange.py +++ b/freqtrade/configuration/timerange.py @@ -7,6 +7,8 @@ from typing import Optional import arrow +from freqtrade.exceptions import OperationalException + logger = logging.getLogger(__name__) @@ -104,6 +106,7 @@ class TimeRange: else: stop = int(stops) if start > stop > 0: - raise Exception('Start date is after stop date for timerange "%s"' % text) + raise OperationalException( + f'Start date is after stop date for timerange "{text}"') return TimeRange(stype[0], stype[1], start, stop) - raise Exception('Incorrect syntax for timerange "%s"' % text) + raise OperationalException(f'Incorrect syntax for timerange "{text}"') diff --git a/tests/test_timerange.py b/tests/test_timerange.py index cd10e219f..dcdaad09d 100644 --- a/tests/test_timerange.py +++ b/tests/test_timerange.py @@ -3,6 +3,7 @@ import arrow import pytest from freqtrade.configuration import TimeRange +from freqtrade.exceptions import OperationalException def test_parse_timerange_incorrect(): @@ -27,10 +28,11 @@ def test_parse_timerange_incorrect(): timerange = TimeRange.parse_timerange('-1231006505000') assert TimeRange(None, 'date', 0, 1231006505) == timerange - with pytest.raises(Exception, match=r'Incorrect syntax.*'): + with pytest.raises(OperationalException, match=r'Incorrect syntax.*'): TimeRange.parse_timerange('-') - with pytest.raises(Exception, match=r'Start date is after stop date for timerange.*'): + with pytest.raises(OperationalException, + match=r'Start date is after stop date for timerange.*'): TimeRange.parse_timerange('20100523-20100522')