diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py index d6d2b5794..567dc213a 100644 --- a/tests/commands/test_commands.py +++ b/tests/commands/test_commands.py @@ -1445,12 +1445,13 @@ def test_start_list_data(testdatadir, capsys): start_list_data(pargs) captured = capsys.readouterr() assert "Found 2 pair / timeframe combinations." in captured.out - assert ("\n| Pair | Timeframe | Type | From | To |\n" - in captured.out) + assert ( + "\n| Pair | Timeframe | Type " + "| From | To | Candles |\n") in captured.out assert "UNITTEST/BTC" not in captured.out assert ( - "\n| XRP/ETH | 1m | spot | 2019-10-11 00:00:00 | 2019-10-13 11:19:00 |\n" - in captured.out) + "\n| XRP/ETH | 1m | spot | " + "2019-10-11 00:00:00 | 2019-10-13 11:19:00 | 2469 |\n") in captured.out @pytest.mark.usefixtures("init_persistence") diff --git a/tests/data/test_datahandler.py b/tests/data/test_datahandler.py index d90822bd3..a0a37c393 100644 --- a/tests/data/test_datahandler.py +++ b/tests/data/test_datahandler.py @@ -148,19 +148,25 @@ def test_jsondatahandler_ohlcv_load(testdatadir, caplog): def test_datahandler_ohlcv_data_min_max(testdatadir): dh = JsonDataHandler(testdatadir) min_max = dh.ohlcv_data_min_max('UNITTEST/BTC', '5m', 'spot') - assert len(min_max) == 2 + assert len(min_max) == 3 # Empty pair min_max = dh.ohlcv_data_min_max('UNITTEST/BTC', '8m', 'spot') - assert len(min_max) == 2 + assert len(min_max) == 3 assert min_max[0] == datetime.fromtimestamp(0, tz=timezone.utc) assert min_max[0] == min_max[1] # Empty pair2 - min_max = dh.ohlcv_data_min_max('NOPAIR/XXX', '4m', 'spot') - assert len(min_max) == 2 + min_max = dh.ohlcv_data_min_max('NOPAIR/XXX', '41m', 'spot') + assert len(min_max) == 3 assert min_max[0] == datetime.fromtimestamp(0, tz=timezone.utc) assert min_max[0] == min_max[1] + # Existing pair ... + min_max = dh.ohlcv_data_min_max('UNITTEST/BTC', '1m', 'spot') + assert len(min_max) == 3 + assert min_max[0] == datetime(2017, 11, 4, 23, 2, tzinfo=timezone.utc) + assert min_max[1] == datetime(2017, 11, 14, 22, 59, tzinfo=timezone.utc) + def test_datahandler__check_empty_df(testdatadir, caplog): dh = JsonDataHandler(testdatadir)