From 29d13f71302125c11f18bba02841678785a79269 Mon Sep 17 00:00:00 2001 From: kryofly Date: Sat, 30 Dec 2017 08:26:08 +0100 Subject: [PATCH] tests cleanup set() usage --- freqtrade/tests/optimize/test_backtesting.py | 32 ++++++++------------ freqtrade/tests/test_acl_pair.py | 6 ++-- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/freqtrade/tests/optimize/test_backtesting.py b/freqtrade/tests/optimize/test_backtesting.py index 42e76a929..94c062cac 100644 --- a/freqtrade/tests/optimize/test_backtesting.py +++ b/freqtrade/tests/optimize/test_backtesting.py @@ -1,7 +1,6 @@ # pragma pylint: disable=missing-docstring,W0212 import math -# import json import pandas as pd # from unittest.mock import MagicMock from freqtrade import exchange, optimize @@ -56,8 +55,7 @@ def trim_dictlist(dl, num): new = {} for pair, pair_data in dl.items(): # Can't figure out why -num wont work - # new[pair] = pair_data[-num:] - new[pair] = pair_data[-100:] + new[pair] = pair_data[num:] return new @@ -144,23 +142,17 @@ def test_backtest_pricecontours(default_conf, mocker): # Please make this work, the load_config needs to be mocked # and cleanups. # def test_backtest_start(default_conf, mocker): -# default_conf['exchange']['pair_whitelist'] = ['BTC_UNITEST'] -# #mocker.patch.dict('freqtrade.main._CONF', default_conf) -# mocker.patch.multiple('freqtrade.misc', -# load_config=MagicMock()) -# -# #mocker.patch('freqtrade.misc.load_config', side_effect=lambda s: {}) -# #mocker.patch('freqtrade.misc.load_config', MagicMock()) -# #side_effect=lambda s: {}) -# #mocker.patch('freqtrade.misc.open', mocker.mock_open( -# # read_data=json.dumps(default_conf) -# #)) -# -# -# print(default_conf) -# args = MagicMock() -# args.level = 10 -# backtesting.start(args) +# default_conf['exchange']['pair_whitelist'] = ['BTC_UNITEST'] +# mocker.patch.dict('freqtrade.main._CONF', default_conf) +# # see https://pypi.python.org/pypi/pytest-mock/ +# # and http://www.voidspace.org.uk/python/mock/patch.html +# # No usage example of simple function mocking, +# # and no documentation of side_effect +# mocker.patch('freqtrade.misc.load_config', new=lambda s, t: {}) +# args = MagicMock() +# args.level = 10 +# #load_config('foo') +# backtesting.start(args) # # Check what sideeffect backtstesting has done. # Probably need to capture standard-output and diff --git a/freqtrade/tests/test_acl_pair.py b/freqtrade/tests/test_acl_pair.py index 8748d97b8..7806677d8 100644 --- a/freqtrade/tests/test_acl_pair.py +++ b/freqtrade/tests/test_acl_pair.py @@ -53,7 +53,7 @@ def test_refresh_whitelist(mocker): whitelist = ['BTC_ETH', 'BTC_TKN'] pairslist = conf['exchange']['pair_whitelist'] # Ensure all except those in whitelist are removed - assert_list_equal(whitelist, pairslist) + set(whitelist) == set(pairslist) def test_refresh_whitelist_dynamic(mocker): @@ -65,7 +65,7 @@ def test_refresh_whitelist_dynamic(mocker): whitelist = ['BTC_ETH', 'BTC_TKN'] refresh_whitelist(whitelist) pairslist = conf['exchange']['pair_whitelist'] - assert_list_equal(whitelist, pairslist) + set(whitelist) == set(pairslist) def test_refresh_whitelist_dynamic_empty(mocker): @@ -78,4 +78,4 @@ def test_refresh_whitelist_dynamic_empty(mocker): conf['exchange']['pair_whitelist'] = [] refresh_whitelist(whitelist) pairslist = conf['exchange']['pair_whitelist'] - assert_list_equal(whitelist, pairslist) + set(whitelist) == set(pairslist)