use normal program flow to handle interrupts

freqtrade/tests/test_exchange.py

@@ -4,6 +4,7 @@ from unittest.mock import MagicMock
 import pytest
 
 from freqtrade.exchange import validate_pairs
+from freqtrade.misc import OperationalException
 
 
 def test_validate_pairs(default_conf, mocker):
@@ -21,7 +22,7 @@ def test_validate_pairs_not_available(default_conf, mocker):
     api_mock.get_markets = MagicMock(return_value=[])
     mocker.patch('freqtrade.exchange._API', api_mock)
     mocker.patch.dict('freqtrade.exchange._CONF', default_conf)
-    with pytest.raises(RuntimeError, match=r'not available'):
+    with pytest.raises(OperationalException, match=r'not available'):
         validate_pairs(default_conf['exchange']['pair_whitelist'])
 
 
@@ -31,5 +32,5 @@ def test_validate_pairs_not_compatible(default_conf, mocker):
     default_conf['stake_currency'] = 'ETH'
     mocker.patch('freqtrade.exchange._API', api_mock)
     mocker.patch.dict('freqtrade.exchange._CONF', default_conf)
-    with pytest.raises(RuntimeError, match=r'not compatible'):
+    with pytest.raises(OperationalException, match=r'not compatible'):
         validate_pairs(default_conf['exchange']['pair_whitelist'])

freqtrade/tests/test_main.py

@@ -6,11 +6,12 @@ import pytest
 import requests
 from sqlalchemy import create_engine
 
+from freqtrade import DependencyException, OperationalException
 from freqtrade.exchange import Exchanges
 from freqtrade.analyze import SignalType
 from freqtrade.main import create_trade, handle_trade, init, \
     get_target_bid, _process
-from freqtrade.misc import get_state, State, FreqtradeException
+from freqtrade.misc import get_state, State
 from freqtrade.persistence import Trade
 
 
@@ -59,7 +60,7 @@ def test_process_exchange_failures(default_conf, ticker, health, mocker):
     assert sleep_mock.has_calls()
 
 
-def test_process_runtime_error(default_conf, ticker, health, mocker):
+def test_process_operational_exception(default_conf, ticker, health, mocker):
     msg_mock = MagicMock()
     mocker.patch.dict('freqtrade.main._CONF', default_conf)
     mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=msg_mock)
@@ -68,14 +69,14 @@ def test_process_runtime_error(default_conf, ticker, health, mocker):
                           validate_pairs=MagicMock(),
                           get_ticker=ticker,
                           get_wallet_health=health,
-                          buy=MagicMock(side_effect=RuntimeError))
+                          buy=MagicMock(side_effect=OperationalException))
     init(default_conf, create_engine('sqlite://'))
     assert get_state() == State.RUNNING
 
     result = _process()
     assert result is False
     assert get_state() == State.STOPPED
-    assert 'RuntimeError' in msg_mock.call_args_list[-1][0][0]
+    assert 'OperationalException' in msg_mock.call_args_list[-1][0][0]
 
 
 def test_process_trade_handling(default_conf, ticker, limit_buy_order, health, mocker):
@@ -141,7 +142,7 @@ def test_create_trade_no_stake_amount(default_conf, ticker, mocker):
                           get_ticker=ticker,
                           buy=MagicMock(return_value='mocked_limit_buy'),
                           get_balance=MagicMock(return_value=default_conf['stake_amount'] * 0.5))
-    with pytest.raises(FreqtradeException, match=r'.*stake amount.*'):
+    with pytest.raises(DependencyException, match=r'.*stake amount.*'):
         create_trade(default_conf['stake_amount'])
 
 
@@ -154,7 +155,7 @@ def test_create_trade_no_pairs(default_conf, ticker, mocker):
                           get_ticker=ticker,
                           buy=MagicMock(return_value='mocked_limit_buy'))
 
-    with pytest.raises(FreqtradeException, match=r'.*No pair in whitelist.*'):
+    with pytest.raises(DependencyException, match=r'.*No pair in whitelist.*'):
         conf = copy.deepcopy(default_conf)
         conf['exchange']['pair_whitelist'] = []
         mocker.patch.dict('freqtrade.main._CONF', conf)