Merge commit '1134c81aad049d4357c8f299ffc801218f3d9574' into feature/objectify

2018-03-03 16:42:37 -08:00
parent 96a343fb29 1134c81aad
commit 38510d4b03
11 changed files with 285 additions and 75 deletions
--- a/freqtrade/tests/conftest.py
+++ b/freqtrade/tests/conftest.py
@@ -285,6 +285,7 @@ def ticker_history_without_bv():
    ]


+# FIX: Perhaps change result fixture to use BTC_UNITEST instead?
@pytest.fixture
 def result():
    with open('freqtrade/tests/testdata/BTC_ETH-1.json') as data_file: