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

Fix test leakage

Browse Source
This commit is contained in:
Matthias 2020-04-02 08:20:50 +02:00
parent eab6c9c5f2
commit 9d7ad23d42
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
freqtrade/data/history/history_utils.py
View File

@ -260,7 +260,9 @@ def _download_trades_history(exchange: Exchange,
""" """
try: try:
since = timerange.startts * 1000 if timerange and timerange.starttype == 'date' else None since = timerange.startts * 1000 if \
(timerange and timerange.starttype == 'date') else int(arrow.utcnow().shift(
days=-30).float_timestamp) * 1000
trades = data_handler.trades_load(pair) trades = data_handler.trades_load(pair)
@ -282,9 +284,7 @@ def _download_trades_history(exchange: Exchange,
# Default since_ms to 30 days if nothing is given # Default since_ms to 30 days if nothing is given
new_trades = exchange.get_historic_trades(pair=pair, new_trades = exchange.get_historic_trades(pair=pair,
since=since if since else since=since,
int(arrow.utcnow().shift(
days=-30).float_timestamp) * 1000,
from_id=from_id, from_id=from_id,
) )
trades.extend(new_trades[1]) trades.extend(new_trades[1])

1
tests/conftest.py
View File

@ -1233,6 +1233,7 @@ def trades_history():
[1565798399862, '126181332', None, 'sell', 0.019626, 0.011, 0.00021588599999999999], [1565798399862, '126181332', None, 'sell', 0.019626, 0.011, 0.00021588599999999999],
[1565798399872, '126181333', None, 'sell', 0.019626, 0.011, 0.00021588599999999999]] [1565798399872, '126181333', None, 'sell', 0.019626, 0.011, 0.00021588599999999999]]
@pytest.fixture(scope="function") @pytest.fixture(scope="function")
def fetch_trades_result(): def fetch_trades_result():
return [{'info': {'a': 126181329, return [{'info': {'a': 126181329,

34
tests/data/test_converter.py
View File

@ -218,33 +218,37 @@ def test_trades_dict_to_list(fetch_trades_result):
assert t[6] == fetch_trades_result[i]['cost'] assert t[6] == fetch_trades_result[i]['cost']
def test_convert_trades_format(mocker, default_conf, testdatadir): def test_convert_trades_format(mocker, default_conf, testdatadir):
file = testdatadir / "XRP_ETH-trades.json.gz" files = [{'old': testdatadir / "XRP_ETH-trades.json.gz",
file_new = testdatadir / "XRP_ETH-trades.json" 'new': testdatadir / "XRP_ETH-trades.json"},
_backup_file(file, copy_file=True) {'old': testdatadir / "XRP_OLD-trades.json.gz",
default_conf['datadir'] = testdatadir 'new': testdatadir / "XRP_OLD-trades.json"},
]
for file in files:
_backup_file(file['old'], copy_file=True)
assert not file['new'].exists()
assert not file_new.exists() default_conf['datadir'] = testdatadir
convert_trades_format(default_conf, convert_from='jsongz', convert_trades_format(default_conf, convert_from='jsongz',
convert_to='json', erase=False) convert_to='json', erase=False)
assert file_new.exists() for file in files:
assert file.exists() assert file['new'].exists()
assert file['old'].exists()
# Remove original file # Remove original file
file.unlink() file['old'].unlink()
# Convert back # Convert back
convert_trades_format(default_conf, convert_from='json', convert_trades_format(default_conf, convert_from='json',
convert_to='jsongz', erase=True) convert_to='jsongz', erase=True)
for file in files:
assert file['old'].exists()
assert not file['new'].exists()
assert file.exists() _clean_test_file(file['old'])
assert not file_new.exists() if file['new'].exists():
file['new'].unlink()
_clean_test_file(file)
if file_new.exists():
file_new.unlink()
def test_convert_ohlcv_format(mocker, default_conf, testdatadir): def test_convert_ohlcv_format(mocker, default_conf, testdatadir):