From bc8ca491cdb057889d7b69431dd509be14bdd801 Mon Sep 17 00:00:00 2001
From: Gerald Lonlas <g.lonlas@gmail.com>
Date: Fri, 2 Mar 2018 21:47:00 +0800
Subject: [PATCH] Minor updates

---
 freqtrade/freqtradebot.py            | 3 ++-
 freqtrade/tests/conftest.py          | 6 ++++--
 freqtrade/tests/test_freqtradebot.py | 7 +++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index 35acb7649..4449e9b7f 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -2,6 +2,7 @@
 Freqtrade is the main module of this bot. It contains the class Freqtrade()
 """
 
+import logging
 import arrow
 import copy
 import json
@@ -36,7 +37,7 @@ class FreqtradeBot(object):
         """
 
         # Init the logger
-        self.logger = Logger(name='freqtrade').get_logger()
+        self.logger = Logger(name=__name__, level=config.get('loglevel')).get_logger()
 
         # Init bot states
         self._state = State.STOPPED
diff --git a/freqtrade/tests/conftest.py b/freqtrade/tests/conftest.py
index 722017a15..3ca953156 100644
--- a/freqtrade/tests/conftest.py
+++ b/freqtrade/tests/conftest.py
@@ -8,6 +8,7 @@ import arrow
 import pytest
 from jsonschema import validate
 from telegram import Chat, Message, Update
+from sqlalchemy import create_engine
 
 from freqtrade.analyze import Analyze
 from freqtrade.constants import Constants
@@ -41,7 +42,7 @@ def get_patched_freqtradebot(mocker, config) -> FreqtradeBot:
     mocker.patch('freqtrade.freqtradebot.RPCManager.send_msg', MagicMock())
     mocker.patch('freqtrade.freqtradebot.Analyze.get_signal', MagicMock())
 
-    return FreqtradeBot(config)
+    return FreqtradeBot(config, create_engine('sqlite://'))
 
 
 @pytest.fixture(scope="module")
@@ -83,7 +84,8 @@ def default_conf():
             "token": "token",
             "chat_id": "0"
         },
-        "initial_state": "running"
+        "initial_state": "running",
+        "loglevel": logging.DEBUG
     }
     validate(configuration, Constants.CONF_SCHEMA)
     return configuration
diff --git a/freqtrade/tests/test_freqtradebot.py b/freqtrade/tests/test_freqtradebot.py
index 5177bd3b7..c1a6819aa 100644
--- a/freqtrade/tests/test_freqtradebot.py
+++ b/freqtrade/tests/test_freqtradebot.py
@@ -8,7 +8,7 @@ import logging
 import time
 from unittest.mock import MagicMock
 from copy import deepcopy
-from typing import Optional
+from typing import Dict, Optional
 import arrow
 import pytest
 import requests
@@ -36,7 +36,7 @@ def get_patched_freqtradebot(mocker, config) -> FreqtradeBot:
     mocker.patch('freqtrade.freqtradebot.exchange.init', MagicMock())
     patch_pymarketcap(mocker)
 
-    return FreqtradeBot(config)
+    return FreqtradeBot(config, create_engine('sqlite://'))
 
 
 def patch_get_signal(mocker, value=(True, False)) -> None:
@@ -63,7 +63,7 @@ def patch_RPCManager(mocker) -> MagicMock:
     return rpc_mock
 
 
-def patch_pymarketcap(mocker, value: Optional[str] = None) -> None:
+def patch_pymarketcap(mocker, value: Optional[Dict[str, float]] = None) -> None:
     """
     Mocker to Pymarketcap to speed up tests
     :param mocker: mocker to patch Pymarketcap class
@@ -530,7 +530,6 @@ def test_process_maybe_execute_buy_exception(mocker, default_conf, caplog) -> No
     """
     Test exception on process_maybe_execute_buy() method
     """
-    caplog.set_level(logging.INFO)
     freqtrade = get_patched_freqtradebot(mocker, default_conf)
 
     mocker.patch(