From edf8e39bc11c6c37b06459ac9d9bdfc38f86eb9a Mon Sep 17 00:00:00 2001
From: hroff-1902 <hroff_raeyd9tzpttf@mail.ru>
Date: Tue, 2 Jun 2020 17:57:45 +0300
Subject: [PATCH] Fix tests after merge

---
 tests/rpc/test_rpc.py           | 2 --
 tests/rpc/test_rpc_apiserver.py | 4 +---
 tests/test_persistence.py       | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/rpc/test_rpc.py b/tests/rpc/test_rpc.py
index 9a55c7639..44d54bad6 100644
--- a/tests/rpc/test_rpc.py
+++ b/tests/rpc/test_rpc.py
@@ -65,7 +65,6 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'min_rate': ANY,
         'max_rate': ANY,
         'strategy': ANY,
-        'ticker_interval': ANY,
         'timeframe': ANY,
         'open_order_id': ANY,
         'close_date': None,
@@ -124,7 +123,6 @@ def test_rpc_trade_status(default_conf, ticker, fee, mocker) -> None:
         'min_rate': ANY,
         'max_rate': ANY,
         'strategy': ANY,
-        'ticker_interval': ANY,
         'timeframe': ANY,
         'open_order_id': ANY,
         'close_date': None,
diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py
index b3859c4e6..5547ee004 100644
--- a/tests/rpc/test_rpc_apiserver.py
+++ b/tests/rpc/test_rpc_apiserver.py
@@ -322,7 +322,7 @@ def test_api_show_config(botclient, mocker):
     assert_response(rc)
     assert 'dry_run' in rc.json
     assert rc.json['exchange'] == 'bittrex'
-    assert rc.json['ticker_interval'] == '5m'
+    assert rc.json['timeframe'] == '5m'
     assert rc.json['state'] == 'running'
     assert not rc.json['trailing_stop']
 
@@ -547,7 +547,6 @@ def test_api_status(botclient, mocker, ticker, fee, markets):
                         'sell_reason': None,
                         'sell_order_status': None,
                         'strategy': 'DefaultStrategy',
-                        'ticker_interval': 5,
                         'timeframe': 5,
                         'exchange': 'bittrex',
                         }]
@@ -671,7 +670,6 @@ def test_api_forcebuy(botclient, mocker, fee):
                        'sell_reason': None,
                        'sell_order_status': None,
                        'strategy': None,
-                       'ticker_interval': None,
                        'timeframe': None,
                        'exchange': 'bittrex',
                        }
diff --git a/tests/test_persistence.py b/tests/test_persistence.py
index 69ee014c5..d55f24719 100644
--- a/tests/test_persistence.py
+++ b/tests/test_persistence.py
@@ -776,7 +776,6 @@ def test_to_json(default_conf, fee):
                       'min_rate': None,
                       'max_rate': None,
                       'strategy': None,
-                      'ticker_interval': None,
                       'timeframe': None,
                       'exchange': 'bittrex',
                       }
@@ -838,7 +837,6 @@ def test_to_json(default_conf, fee):
                       'sell_reason': None,
                       'sell_order_status': None,
                       'strategy': None,
-                      'ticker_interval': None,
                       'timeframe': None,
                       'exchange': 'bittrex',
                       }