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

Update test naming

Browse Source
This commit is contained in:
Matthias 2022-12-14 19:58:45 +01:00
parent fa260e6560
commit ca2a878b86
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freqtrade/data/dataprovider.py
View File

@ -186,7 +186,7 @@ class DataProvider:
if len(dataframe) >= FULL_DATAFRAME_THRESHOLD: if len(dataframe) >= FULL_DATAFRAME_THRESHOLD:
# This is likely a full dataframe # This is likely a full dataframe
# Add the dataframe to the dataprovider # Add the dataframe to the dataprovider
self._add_external_df( self._replace_external_df(
pair, pair,
dataframe, dataframe,
last_analyzed=last_analyzed, last_analyzed=last_analyzed,
@ -228,7 +228,7 @@ class DataProvider:
appended_df = append_candles_to_dataframe(existing_df1, dataframe) appended_df = append_candles_to_dataframe(existing_df1, dataframe)
# Everything is good, we appended # Everything is good, we appended
self._add_external_df( self._replace_external_df(
pair, pair,
appended_df, appended_df,
last_analyzed=last_analyzed, last_analyzed=last_analyzed,

29
tests/data/test_dataprovider.py
View File

@ -161,9 +161,9 @@ def test_producer_pairs(mocker, default_conf, ohlcv_history):
assert dataprovider.get_producer_pairs("bad") == [] assert dataprovider.get_producer_pairs("bad") == []
def test_get_producer_df(mocker, default_conf, ohlcv_history): def test_get_producer_df(mocker, default_conf):
dataprovider = DataProvider(default_conf, None) dataprovider = DataProvider(default_conf, None)
ohlcv_history = generate_test_data('5m', 150)
pair = 'BTC/USDT' pair = 'BTC/USDT'
timeframe = default_conf['timeframe'] timeframe = default_conf['timeframe']
candle_type = CandleType.SPOT candle_type = CandleType.SPOT
@ -414,27 +414,28 @@ def test_dp_send_msg(default_conf):
assert msg not in dp._msg_queue assert msg not in dp._msg_queue
def test_dp__add_external_candle(default_conf_usdt): def test_dp__add_external_df(default_conf_usdt):
timeframe = '1h' timeframe = '1h'
default_conf_usdt["timeframe"] = timeframe default_conf_usdt["timeframe"] = timeframe
dp = DataProvider(default_conf_usdt, None) dp = DataProvider(default_conf_usdt, None)
df = generate_test_data(timeframe, 24, '2022-01-01 00:00:00+00:00') df = generate_test_data(timeframe, 24, '2022-01-01 00:00:00+00:00')
last_analyzed = datetime.now(timezone.utc) last_analyzed = datetime.now(timezone.utc)
res = dp._add_external_candle('ETH/USDT', df, last_analyzed, timeframe, CandleType.SPOT) res = dp._add_external_df('ETH/USDT', df, last_analyzed, timeframe, CandleType.SPOT)
assert res[0] is False assert res[0] is False
# Why 1000 ?? # Why 1000 ??
assert res[1] == 1000 assert res[1] == 1000
dp._add_external_df('ETH/USDT', df, last_analyzed, timeframe, CandleType.SPOT) # Hard add dataframe
dp._replace_external_df('ETH/USDT', df, last_analyzed, timeframe, CandleType.SPOT)
# BTC is not stored yet # BTC is not stored yet
res = dp._add_external_candle('BTC/USDT', df, last_analyzed, timeframe, CandleType.SPOT) res = dp._add_external_df('BTC/USDT', df, last_analyzed, timeframe, CandleType.SPOT)
assert res[0] is False assert res[0] is False
df, _ = dp.get_producer_df('ETH/USDT', timeframe, CandleType.SPOT) df_res, _ = dp.get_producer_df('ETH/USDT', timeframe, CandleType.SPOT)
assert len(df) == 24 assert len(df_res) == 24
# Add the same dataframe again - dataframe size shall not change. # Add the same dataframe again - dataframe size shall not change.
res = dp._add_external_candle('ETH/USDT', df, last_analyzed, timeframe, CandleType.SPOT) res = dp._add_external_df('ETH/USDT', df, last_analyzed, timeframe, CandleType.SPOT)
assert res[0] is True assert res[0] is True
assert res[1] == 0 assert res[1] == 0
df, _ = dp.get_producer_df('ETH/USDT', timeframe, CandleType.SPOT) df, _ = dp.get_producer_df('ETH/USDT', timeframe, CandleType.SPOT)
@ -443,7 +444,7 @@ def test_dp__add_external_candle(default_conf_usdt):
# Add a new day. # Add a new day.
df2 = generate_test_data(timeframe, 24, '2022-01-02 00:00:00+00:00') df2 = generate_test_data(timeframe, 24, '2022-01-02 00:00:00+00:00')
res = dp._add_external_candle('ETH/USDT', df2, last_analyzed, timeframe, CandleType.SPOT) res = dp._add_external_df('ETH/USDT', df2, last_analyzed, timeframe, CandleType.SPOT)
assert res[0] is True assert res[0] is True
assert res[1] == 0 assert res[1] == 0
df, _ = dp.get_producer_df('ETH/USDT', timeframe, CandleType.SPOT) df, _ = dp.get_producer_df('ETH/USDT', timeframe, CandleType.SPOT)
@ -452,7 +453,7 @@ def test_dp__add_external_candle(default_conf_usdt):
# Add a dataframe with a 12 hour offset - so 12 candles are overlapping, and 12 valid. # Add a dataframe with a 12 hour offset - so 12 candles are overlapping, and 12 valid.
df3 = generate_test_data(timeframe, 24, '2022-01-02 12:00:00+00:00') df3 = generate_test_data(timeframe, 24, '2022-01-02 12:00:00+00:00')
res = dp._add_external_candle('ETH/USDT', df3, last_analyzed, timeframe, CandleType.SPOT) res = dp._add_external_df('ETH/USDT', df3, last_analyzed, timeframe, CandleType.SPOT)
assert res[0] is True assert res[0] is True
assert res[1] == 0 assert res[1] == 0
df, _ = dp.get_producer_df('ETH/USDT', timeframe, CandleType.SPOT) df, _ = dp.get_producer_df('ETH/USDT', timeframe, CandleType.SPOT)
@ -463,7 +464,7 @@ def test_dp__add_external_candle(default_conf_usdt):
# Generate 1 new candle # Generate 1 new candle
df4 = generate_test_data(timeframe, 1, '2022-01-03 12:00:00+00:00') df4 = generate_test_data(timeframe, 1, '2022-01-03 12:00:00+00:00')
res = dp._add_external_candle('ETH/USDT', df4, last_analyzed, timeframe, CandleType.SPOT) res = dp._add_external_df('ETH/USDT', df4, last_analyzed, timeframe, CandleType.SPOT)
# assert res[0] is True # assert res[0] is True
# assert res[1] == 0 # assert res[1] == 0
df, _ = dp.get_producer_df('ETH/USDT', timeframe, CandleType.SPOT) df, _ = dp.get_producer_df('ETH/USDT', timeframe, CandleType.SPOT)
@ -474,7 +475,7 @@ def test_dp__add_external_candle(default_conf_usdt):
# Gap in the data ... # Gap in the data ...
df4 = generate_test_data(timeframe, 1, '2022-01-05 00:00:00+00:00') df4 = generate_test_data(timeframe, 1, '2022-01-05 00:00:00+00:00')
res = dp._add_external_candle('ETH/USDT', df4, last_analyzed, timeframe, CandleType.SPOT) res = dp._add_external_df('ETH/USDT', df4, last_analyzed, timeframe, CandleType.SPOT)
assert res[0] is False assert res[0] is False
# 36 hours - from 2022-01-03 12:00:00+00:00 to 2022-01-05 00:00:00+00:00 # 36 hours - from 2022-01-03 12:00:00+00:00 to 2022-01-05 00:00:00+00:00
assert res[1] == 36 assert res[1] == 36
@ -484,7 +485,7 @@ def test_dp__add_external_candle(default_conf_usdt):
# Empty dataframe # Empty dataframe
df4 = generate_test_data(timeframe, 0, '2022-01-05 00:00:00+00:00') df4 = generate_test_data(timeframe, 0, '2022-01-05 00:00:00+00:00')
res = dp._add_external_candle('ETH/USDT', df4, last_analyzed, timeframe, CandleType.SPOT) res = dp._add_external_df('ETH/USDT', df4, last_analyzed, timeframe, CandleType.SPOT)
assert res[0] is False assert res[0] is False
# 36 hours - from 2022-01-03 12:00:00+00:00 to 2022-01-05 00:00:00+00:00 # 36 hours - from 2022-01-03 12:00:00+00:00 to 2022-01-05 00:00:00+00:00
assert res[1] == 0 assert res[1] == 0