Fix test
This commit is contained in:
@@ -1389,8 +1389,6 @@ def test_convert_data_trades(mocker, testdatadir):
|
|||||||
def test_start_list_data(testdatadir, capsys):
|
def test_start_list_data(testdatadir, capsys):
|
||||||
args = [
|
args = [
|
||||||
"list-data",
|
"list-data",
|
||||||
"--data-format-ohlcv",
|
|
||||||
"json",
|
|
||||||
"--datadir",
|
"--datadir",
|
||||||
str(testdatadir),
|
str(testdatadir),
|
||||||
]
|
]
|
||||||
@@ -1405,7 +1403,7 @@ def test_start_list_data(testdatadir, capsys):
|
|||||||
args = [
|
args = [
|
||||||
"list-data",
|
"list-data",
|
||||||
"--data-format-ohlcv",
|
"--data-format-ohlcv",
|
||||||
"json",
|
"feather",
|
||||||
"--pairs", "XRP/ETH",
|
"--pairs", "XRP/ETH",
|
||||||
"--datadir",
|
"--datadir",
|
||||||
str(testdatadir),
|
str(testdatadir),
|
||||||
@@ -1421,8 +1419,6 @@ def test_start_list_data(testdatadir, capsys):
|
|||||||
|
|
||||||
args = [
|
args = [
|
||||||
"list-data",
|
"list-data",
|
||||||
"--data-format-ohlcv",
|
|
||||||
"json",
|
|
||||||
"--trading-mode", "futures",
|
"--trading-mode", "futures",
|
||||||
"--datadir",
|
"--datadir",
|
||||||
str(testdatadir),
|
str(testdatadir),
|
||||||
@@ -1439,8 +1435,6 @@ def test_start_list_data(testdatadir, capsys):
|
|||||||
|
|
||||||
args = [
|
args = [
|
||||||
"list-data",
|
"list-data",
|
||||||
"--data-format-ohlcv",
|
|
||||||
"json",
|
|
||||||
"--pairs", "XRP/ETH",
|
"--pairs", "XRP/ETH",
|
||||||
"--datadir",
|
"--datadir",
|
||||||
str(testdatadir),
|
str(testdatadir),
|
||||||
|
|||||||
@@ -304,8 +304,8 @@ def test_convert_ohlcv_format(default_conf, testdatadir, tmpdir, file_base, cand
|
|||||||
files_temp = []
|
files_temp = []
|
||||||
files_new = []
|
files_new = []
|
||||||
for file in file_base:
|
for file in file_base:
|
||||||
file_orig = testdatadir / f"{prependix}{file}.json"
|
file_orig = testdatadir / f"{prependix}{file}.feather"
|
||||||
file_temp = tmpdir1 / f"{prependix}{file}.json"
|
file_temp = tmpdir1 / f"{prependix}{file}.feather"
|
||||||
file_new = tmpdir1 / f"{prependix}{file}.json.gz"
|
file_new = tmpdir1 / f"{prependix}{file}.json.gz"
|
||||||
IDataHandler.create_dir_if_needed(file_temp)
|
IDataHandler.create_dir_if_needed(file_temp)
|
||||||
copyfile(file_orig, file_temp)
|
copyfile(file_orig, file_temp)
|
||||||
@@ -327,7 +327,7 @@ def test_convert_ohlcv_format(default_conf, testdatadir, tmpdir, file_base, cand
|
|||||||
|
|
||||||
convert_ohlcv_format(
|
convert_ohlcv_format(
|
||||||
default_conf,
|
default_conf,
|
||||||
convert_from='json',
|
convert_from='feather',
|
||||||
convert_to='jsongz',
|
convert_to='jsongz',
|
||||||
erase=False,
|
erase=False,
|
||||||
)
|
)
|
||||||
@@ -341,7 +341,7 @@ def test_convert_ohlcv_format(default_conf, testdatadir, tmpdir, file_base, cand
|
|||||||
convert_ohlcv_format(
|
convert_ohlcv_format(
|
||||||
default_conf,
|
default_conf,
|
||||||
convert_from='jsongz',
|
convert_from='jsongz',
|
||||||
convert_to='json',
|
convert_to='feather',
|
||||||
erase=True,
|
erase=True,
|
||||||
)
|
)
|
||||||
for file in (files_temp):
|
for file in (files_temp):
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ from tests.conftest import log_has, log_has_re
|
|||||||
|
|
||||||
|
|
||||||
def test_datahandler_ohlcv_get_pairs(testdatadir):
|
def test_datahandler_ohlcv_get_pairs(testdatadir):
|
||||||
pairs = JsonDataHandler.ohlcv_get_pairs(testdatadir, '5m', candle_type=CandleType.SPOT)
|
pairs = FeatherDataHandler.ohlcv_get_pairs(testdatadir, '5m', candle_type=CandleType.SPOT)
|
||||||
# Convert to set to avoid failures due to sorting
|
# Convert to set to avoid failures due to sorting
|
||||||
assert set(pairs) == {'UNITTEST/BTC', 'XLM/BTC', 'ETH/BTC', 'TRX/BTC', 'LTC/BTC',
|
assert set(pairs) == {'UNITTEST/BTC', 'XLM/BTC', 'ETH/BTC', 'TRX/BTC', 'LTC/BTC',
|
||||||
'XMR/BTC', 'ZEC/BTC', 'ADA/BTC', 'ETC/BTC', 'NXT/BTC',
|
'XMR/BTC', 'ZEC/BTC', 'ADA/BTC', 'ETC/BTC', 'NXT/BTC',
|
||||||
@@ -32,7 +32,7 @@ def test_datahandler_ohlcv_get_pairs(testdatadir):
|
|||||||
pairs = HDF5DataHandler.ohlcv_get_pairs(testdatadir, '5m', candle_type=CandleType.SPOT)
|
pairs = HDF5DataHandler.ohlcv_get_pairs(testdatadir, '5m', candle_type=CandleType.SPOT)
|
||||||
assert set(pairs) == {'UNITTEST/BTC'}
|
assert set(pairs) == {'UNITTEST/BTC'}
|
||||||
|
|
||||||
pairs = JsonDataHandler.ohlcv_get_pairs(testdatadir, '1h', candle_type=CandleType.MARK)
|
pairs = FeatherDataHandler.ohlcv_get_pairs(testdatadir, '1h', candle_type=CandleType.MARK)
|
||||||
assert set(pairs) == {'UNITTEST/USDT:USDT', 'XRP/USDT:USDT'}
|
assert set(pairs) == {'UNITTEST/USDT:USDT', 'XRP/USDT:USDT'}
|
||||||
|
|
||||||
pairs = JsonGzDataHandler.ohlcv_get_pairs(testdatadir, '1h', candle_type=CandleType.FUTURES)
|
pairs = JsonGzDataHandler.ohlcv_get_pairs(testdatadir, '1h', candle_type=CandleType.FUTURES)
|
||||||
@@ -79,7 +79,7 @@ def test_rebuild_pair_from_filename(input, expected):
|
|||||||
|
|
||||||
|
|
||||||
def test_datahandler_ohlcv_get_available_data(testdatadir):
|
def test_datahandler_ohlcv_get_available_data(testdatadir):
|
||||||
paircombs = JsonDataHandler.ohlcv_get_available_data(testdatadir, TradingMode.SPOT)
|
paircombs = FeatherDataHandler.ohlcv_get_available_data(testdatadir, TradingMode.SPOT)
|
||||||
# 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/BTC', '5m', CandleType.SPOT),
|
('UNITTEST/BTC', '5m', CandleType.SPOT),
|
||||||
@@ -101,7 +101,7 @@ def test_datahandler_ohlcv_get_available_data(testdatadir):
|
|||||||
('NOPAIR/XXX', '4m', CandleType.SPOT),
|
('NOPAIR/XXX', '4m', CandleType.SPOT),
|
||||||
}
|
}
|
||||||
|
|
||||||
paircombs = JsonDataHandler.ohlcv_get_available_data(testdatadir, TradingMode.FUTURES)
|
paircombs = FeatherDataHandler.ohlcv_get_available_data(testdatadir, TradingMode.FUTURES)
|
||||||
# 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:USDT', '1h', 'mark'),
|
('UNITTEST/USDT:USDT', '1h', 'mark'),
|
||||||
@@ -444,7 +444,7 @@ def test_generic_datahandler_ohlcv_load_and_resave(
|
|||||||
tmpdir2 = tmpdir1 / 'futures'
|
tmpdir2 = tmpdir1 / 'futures'
|
||||||
tmpdir2.mkdir()
|
tmpdir2.mkdir()
|
||||||
# Load data from one common file
|
# Load data from one common file
|
||||||
dhbase = get_datahandler(testdatadir, 'json')
|
dhbase = get_datahandler(testdatadir, 'feather')
|
||||||
ohlcv = dhbase._ohlcv_load(pair, timeframe, None, candle_type=candle_type)
|
ohlcv = dhbase._ohlcv_load(pair, timeframe, None, candle_type=candle_type)
|
||||||
assert isinstance(ohlcv, DataFrame)
|
assert isinstance(ohlcv, DataFrame)
|
||||||
assert len(ohlcv) > 0
|
assert len(ohlcv) > 0
|
||||||
|
|||||||
@@ -63,9 +63,10 @@ def test_historic_ohlcv(mocker, default_conf, ohlcv_history):
|
|||||||
|
|
||||||
def test_historic_ohlcv_dataformat(mocker, default_conf, ohlcv_history):
|
def test_historic_ohlcv_dataformat(mocker, default_conf, ohlcv_history):
|
||||||
hdf5loadmock = MagicMock(return_value=ohlcv_history)
|
hdf5loadmock = MagicMock(return_value=ohlcv_history)
|
||||||
jsonloadmock = MagicMock(return_value=ohlcv_history)
|
featherloadmock = MagicMock(return_value=ohlcv_history)
|
||||||
mocker.patch("freqtrade.data.history.hdf5datahandler.HDF5DataHandler._ohlcv_load", hdf5loadmock)
|
mocker.patch("freqtrade.data.history.hdf5datahandler.HDF5DataHandler._ohlcv_load", hdf5loadmock)
|
||||||
mocker.patch("freqtrade.data.history.jsondatahandler.JsonDataHandler._ohlcv_load", jsonloadmock)
|
mocker.patch("freqtrade.data.history.featherdatahandler.FeatherDataHandler._ohlcv_load",
|
||||||
|
featherloadmock)
|
||||||
|
|
||||||
default_conf["runmode"] = RunMode.BACKTEST
|
default_conf["runmode"] = RunMode.BACKTEST
|
||||||
exchange = get_patched_exchange(mocker, default_conf)
|
exchange = get_patched_exchange(mocker, default_conf)
|
||||||
@@ -73,17 +74,17 @@ def test_historic_ohlcv_dataformat(mocker, default_conf, ohlcv_history):
|
|||||||
data = dp.historic_ohlcv("UNITTEST/BTC", "5m")
|
data = dp.historic_ohlcv("UNITTEST/BTC", "5m")
|
||||||
assert isinstance(data, DataFrame)
|
assert isinstance(data, DataFrame)
|
||||||
hdf5loadmock.assert_not_called()
|
hdf5loadmock.assert_not_called()
|
||||||
jsonloadmock.assert_called_once()
|
featherloadmock.assert_called_once()
|
||||||
|
|
||||||
# Switching to dataformat hdf5
|
# Switching to dataformat hdf5
|
||||||
hdf5loadmock.reset_mock()
|
hdf5loadmock.reset_mock()
|
||||||
jsonloadmock.reset_mock()
|
featherloadmock.reset_mock()
|
||||||
default_conf["dataformat_ohlcv"] = "hdf5"
|
default_conf["dataformat_ohlcv"] = "hdf5"
|
||||||
dp = DataProvider(default_conf, exchange)
|
dp = DataProvider(default_conf, exchange)
|
||||||
data = dp.historic_ohlcv("UNITTEST/BTC", "5m")
|
data = dp.historic_ohlcv("UNITTEST/BTC", "5m")
|
||||||
assert isinstance(data, DataFrame)
|
assert isinstance(data, DataFrame)
|
||||||
hdf5loadmock.assert_called_once()
|
hdf5loadmock.assert_called_once()
|
||||||
jsonloadmock.assert_not_called()
|
featherloadmock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('candle_type', [
|
@pytest.mark.parametrize('candle_type', [
|
||||||
|
|||||||
Reference in New Issue
Block a user