adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main returns integer instead of sys.exit

Browse Source
This commit is contained in:
kryofly 2018-01-13 13:16:40 +01:00
parent 53447e7ef5
commit a62a5f814a
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freqtrade/main.py
View File

@ -446,7 +446,7 @@ def cleanup() -> None:
exit(0) exit(0)
def main(sysargv=sys.argv[1:]) -> None: def main(sysargv=sys.argv[1:]) -> int:
""" """
Loads and validates the config and handles the main loop Loads and validates the config and handles the main loop
:return: None :return: None
@ -458,7 +458,7 @@ def main(sysargv=sys.argv[1:]) -> None:
# A subcommand has been issued # A subcommand has been issued
if hasattr(args, 'func'): if hasattr(args, 'func'):
args.func(args) args.func(args)
exit(0) return 0
# Initialize logger # Initialize logger
logging.basicConfig( logging.basicConfig(
@ -514,7 +514,8 @@ def main(sysargv=sys.argv[1:]) -> None:
logger.exception('Got fatal exception!') logger.exception('Got fatal exception!')
finally: finally:
cleanup() cleanup()
return 0
if __name__ == '__main__': if __name__ == '__main__':
main() main(sys.argv[1:])

18
freqtrade/tests/test_main.py
View File

@ -25,8 +25,7 @@ def test_parse_args_backtesting(mocker):
further argument parsing is done in test_misc.py """ further argument parsing is done in test_misc.py """
backtesting_mock = mocker.patch( backtesting_mock = mocker.patch(
'freqtrade.optimize.backtesting.start', MagicMock()) 'freqtrade.optimize.backtesting.start', MagicMock())
with pytest.raises(SystemExit, match=r'0'): main.main(['backtesting'])
main.main(['backtesting'])
assert backtesting_mock.call_count == 1 assert backtesting_mock.call_count == 1
call_args = backtesting_mock.call_args[0][0] call_args = backtesting_mock.call_args[0][0]
assert call_args.config == 'config.json' assert call_args.config == 'config.json'
@ -40,8 +39,7 @@ def test_parse_args_backtesting(mocker):
def test_main_start_hyperopt(mocker): def test_main_start_hyperopt(mocker):
hyperopt_mock = mocker.patch( hyperopt_mock = mocker.patch(
'freqtrade.optimize.hyperopt.start', MagicMock()) 'freqtrade.optimize.hyperopt.start', MagicMock())
with pytest.raises(SystemExit, match=r'0'): main.main(['hyperopt'])
main.main(['hyperopt'])
assert hyperopt_mock.call_count == 1 assert hyperopt_mock.call_count == 1
call_args = hyperopt_mock.call_args[0][0] call_args = hyperopt_mock.call_args[0][0]
assert call_args.config == 'config.json' assert call_args.config == 'config.json'
@ -50,6 +48,18 @@ def test_main_start_hyperopt(mocker):
assert call_args.func is not None assert call_args.func is not None
# def test_main_trader(mocker):
# mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock())
# mocker.patch('freqtrade.misc.get_state', return_value=True)
# mocker.patch.multiple('freqtrade.main',
# init=MagicMock(),
# cleanup=MagicMock(),
# throttle=MagicMock()
# )
# Cant run this yet because we have an unconditional while loop in main
# assert 0 == main.main([])
def test_process_maybe_execute_buy(default_conf, mocker): def test_process_maybe_execute_buy(default_conf, mocker):
mocker.patch.dict('freqtrade.main._CONF', default_conf) mocker.patch.dict('freqtrade.main._CONF', default_conf)
mocker.patch('freqtrade.main.create_trade', return_value=True) mocker.patch('freqtrade.main.create_trade', return_value=True)