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

Update converter tests

This commit is contained in:
Matthias 2021-12-07 06:54:00 +01:00
parent a58c2c4f6c
commit 5a3b907132
5 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/commands/test_commands.py
View File

@ -1373,9 +1373,9 @@ def test_start_list_data(testdatadir, capsys):
captured = capsys.readouterr() captured = capsys.readouterr()
assert "Found 3 pair / timeframe combinations." in captured.out assert "Found 3 pair / timeframe combinations." in captured.out
assert "\n| Pair | Timeframe | Type |\n" in captured.out assert "\n| Pair | Timeframe | Type |\n" in captured.out
assert "\n| XRP/USDT | 1h | |\n" in captured.out assert "\n| XRP/USDT | 1h | futures |\n" in captured.out
assert "\n| XRP/USDT | 1h | mark |\n" in captured.out assert "\n| XRP/USDT | 1h | mark |\n" in captured.out
@pytest.mark.usefixtures("init_persistence") @pytest.mark.usefixtures("init_persistence")

48
tests/data/test_converter.py
View File

@ -12,6 +12,7 @@ from freqtrade.data.converter import (convert_ohlcv_format, convert_trades_forma
trades_to_ohlcv, trim_dataframe) trades_to_ohlcv, trim_dataframe)
from freqtrade.data.history import (get_timerange, load_data, load_pair_history, from freqtrade.data.history import (get_timerange, load_data, load_pair_history,
validate_backtest_data) validate_backtest_data)
from freqtrade.data.history.idatahandler import IDataHandler
from freqtrade.enums import CandleType from freqtrade.enums import CandleType
from tests.conftest import log_has, log_has_re from tests.conftest import log_has, log_has_re
from tests.data.test_history import _clean_test_file from tests.data.test_history import _clean_test_file
@ -135,14 +136,15 @@ def test_ohlcv_fill_up_missing_data2(caplog):
def test_ohlcv_drop_incomplete(caplog): def test_ohlcv_drop_incomplete(caplog):
timeframe = '1d' timeframe = '1d'
ticks = [[ ticks = [
1559750400000, # 2019-06-04 [
8.794e-05, # open 1559750400000, # 2019-06-04
8.948e-05, # high 8.794e-05, # open
8.794e-05, # low 8.948e-05, # high
8.88e-05, # close 8.794e-05, # low
2255, # volume (in quote currency) 8.88e-05, # close
], 2255, # volume (in quote currency)
],
[ [
1559836800000, # 2019-06-05 1559836800000, # 2019-06-05
8.88e-05, 8.88e-05,
@ -150,7 +152,7 @@ def test_ohlcv_drop_incomplete(caplog):
8.88e-05, 8.88e-05,
8.893e-05, 8.893e-05,
9911, 9911,
], ],
[ [
1559923200000, # 2019-06-06 1559923200000, # 2019-06-06
8.891e-05, 8.891e-05,
@ -158,7 +160,7 @@ def test_ohlcv_drop_incomplete(caplog):
8.875e-05, 8.875e-05,
8.877e-05, 8.877e-05,
2251 2251
], ],
[ [
1560009600000, # 2019-06-07 1560009600000, # 2019-06-07
8.877e-05, 8.877e-05,
@ -166,7 +168,7 @@ def test_ohlcv_drop_incomplete(caplog):
8.895e-05, 8.895e-05,
8.817e-05, 8.817e-05,
123551 123551
] ]
] ]
caplog.set_level(logging.DEBUG) caplog.set_level(logging.DEBUG)
data = ohlcv_to_dataframe(ticks, timeframe, pair="UNITTEST/BTC", data = ohlcv_to_dataframe(ticks, timeframe, pair="UNITTEST/BTC",
@ -289,17 +291,19 @@ def test_convert_trades_format(default_conf, testdatadir, tmpdir):
file['new'].unlink() file['new'].unlink()
@pytest.mark.parametrize('file_base', [ @pytest.mark.parametrize('file_base,candletype', [
('XRP_ETH-5m'), ('XRP_ETH-5m', CandleType.SPOT),
('XRP_ETH-1m'), ('XRP_ETH-1m', CandleType.SPOT),
# ('XRP_USDT-1h-mark'), #TODO-lev: Create .gz file ('XRP_USDT-1h-mark', CandleType.MARK),
('XRP_USDT-1h-futures', CandleType.FUTURES),
]) ])
def test_convert_ohlcv_format(default_conf, testdatadir, tmpdir, file_base): def test_convert_ohlcv_format(default_conf, testdatadir, tmpdir, file_base, candletype):
tmpdir1 = Path(tmpdir) tmpdir1 = Path(tmpdir)
prependix = '' if candletype == CandleType.SPOT else 'futures/'
file_orig = testdatadir / f"{file_base}.json" file_orig = testdatadir / f"{prependix}{file_base}.json"
file_temp = tmpdir1 / f"{file_base}.json" file_temp = tmpdir1 / f"{prependix}{file_base}.json"
file_new = tmpdir1 / f"{file_base}.json.gz" file_new = tmpdir1 / f"{prependix}{file_base}.json.gz"
IDataHandler.create_dir_if_needed(file_temp)
copyfile(file_orig, file_temp) copyfile(file_orig, file_temp)
@ -314,7 +318,7 @@ def test_convert_ohlcv_format(default_conf, testdatadir, tmpdir, file_base):
convert_from='json', convert_from='json',
convert_to='jsongz', convert_to='jsongz',
erase=False, erase=False,
candle_type=CandleType.SPOT candle_type=candletype
) )
assert file_new.exists() assert file_new.exists()
@ -328,7 +332,7 @@ def test_convert_ohlcv_format(default_conf, testdatadir, tmpdir, file_base):
convert_from='jsongz', convert_from='jsongz',
convert_to='json', convert_to='json',
erase=True, erase=True,
candle_type=CandleType.SPOT candle_type=candletype
) )
assert file_temp.exists() assert file_temp.exists()

2
tests/data/test_history.py
View File

@ -743,7 +743,7 @@ def test_datahandler_ohlcv_get_available_data(testdatadir):
# Convert to set to avoid failures due to sorting # Convert to set to avoid failures due to sorting
assert set(paircombs) == { assert set(paircombs) == {
('UNITTEST/USDT', '1h', 'mark'), ('UNITTEST/USDT', '1h', 'mark'),
('XRP/USDT', '1h', ''), ('XRP/USDT', '1h', 'futures'),
('XRP/USDT', '1h', 'mark'), ('XRP/USDT', '1h', 'mark'),
} }

2
tests/rpc/test_rpc_apiserver.py
View File

@ -1356,7 +1356,7 @@ def test_list_available_pairs(botclient):
ftbot.config['trading_mode'] = 'futures' ftbot.config['trading_mode'] = 'futures'
rc = client_get( rc = client_get(
client, f"{BASE_URI}/available_pairs?timeframe=1h") client, f"{BASE_URI}/available_pairs?timeframe=1h&candletype=futures")
assert_response(rc) assert_response(rc)
assert rc.json()['length'] == 1 assert rc.json()['length'] == 1
assert rc.json()['pairs'] == ['XRP/USDT'] assert rc.json()['pairs'] == ['XRP/USDT']

0
tests/testdata/futures/XRP_USDT-1h.json → tests/testdata/futures/XRP_USDT-1h-futures.json vendored
View File