From bf2c0390e7cc01020dbd10d2990a3606f75adaa1 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sun, 16 Jun 2019 12:54:27 +0200 Subject: [PATCH] Adjust some imports --- freqtrade/tests/conftest.py | 5 +++++ freqtrade/tests/data/test_btanalysis.py | 8 ++------ freqtrade/tests/test_persistence.py | 5 ----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/freqtrade/tests/conftest.py b/freqtrade/tests/conftest.py index 034cb5f8b..e956d89c4 100644 --- a/freqtrade/tests/conftest.py +++ b/freqtrade/tests/conftest.py @@ -151,6 +151,11 @@ def patch_coinmarketcap(mocker) -> None: ) +@pytest.fixture(scope='function') +def init_persistence(default_conf): + persistence.init(default_conf['db_url'], default_conf['dry_run']) + + @pytest.fixture(scope="function") def default_conf(): """ Returns validated configuration suitable for most tests """ diff --git a/freqtrade/tests/data/test_btanalysis.py b/freqtrade/tests/data/test_btanalysis.py index aa066557b..6fa529394 100644 --- a/freqtrade/tests/data/test_btanalysis.py +++ b/freqtrade/tests/data/test_btanalysis.py @@ -4,15 +4,12 @@ from arrow import Arrow import pytest from pandas import DataFrame, to_datetime -from freqtrade.arguments import Arguments, TimeRange +from freqtrade.arguments import TimeRange from freqtrade.data.btanalysis import (BT_DATA_COLUMNS, extract_trades_of_period, load_backtest_data, load_trades) from freqtrade.data.history import load_pair_history, make_testdata_path -from freqtrade.persistence import Trade, init -from freqtrade.strategy.interface import SellType -from freqtrade.tests.test_persistence import (create_mock_trades, - init_persistence) +from freqtrade.tests.test_persistence import create_mock_trades def test_load_backtest_data(): @@ -85,4 +82,3 @@ def test_extract_trades_of_period(): assert trades1.iloc[0].close_time == Arrow(2017, 11, 14, 10, 41, 0).datetime assert trades1.iloc[-1].open_time == Arrow(2017, 11, 14, 14, 20, 0).datetime assert trades1.iloc[-1].close_time == Arrow(2017, 11, 14, 15, 25, 0).datetime - diff --git a/freqtrade/tests/test_persistence.py b/freqtrade/tests/test_persistence.py index 381f04bd1..32425ef7b 100644 --- a/freqtrade/tests/test_persistence.py +++ b/freqtrade/tests/test_persistence.py @@ -11,11 +11,6 @@ from freqtrade.persistence import Trade, clean_dry_run_db, init from freqtrade.tests.conftest import log_has -@pytest.fixture(scope='function') -def init_persistence(default_conf): - init(default_conf['db_url'], default_conf['dry_run']) - - def create_mock_trades(fee): """ Create some fake trades ...