From 73e07264341767fc363999ece5885a75f04c3b36 Mon Sep 17 00:00:00 2001
From: Johannes <johannes@steibel.de>
Date: Tue, 24 Oct 2017 07:24:36 +0200
Subject: [PATCH] Added sample test case

---
 .travis.yml                 |  4 +++-
 modules/core/core.py        |  8 +++++++-
 modules/logs/__init__.py    |  4 +++-
 tests/logs/test_log_view.py | 19 +++++++++++++++++++
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 tests/logs/test_log_view.py

diff --git a/.travis.yml b/.travis.yml
index c76360f..70ff5ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,4 +3,6 @@ python:
   - "2.7"
 # command to install dependencies
 install:
-  - pip install -r requirements.txt
\ No newline at end of file
+  - pip install -r requirements.txt
+
+script: make test
\ No newline at end of file
diff --git a/modules/core/core.py b/modules/core/core.py
index 5e5e78f..34af8ca 100755
--- a/modules/core/core.py
+++ b/modules/core/core.py
@@ -10,6 +10,7 @@ from functools import wraps, update_wrapper
 from importlib import import_module
 from time import localtime, strftime
 import time
+import os.path
 
 from flask import Flask, redirect, json, g, make_response
 from flask_socketio import SocketIO
@@ -275,11 +276,16 @@ class FermentationCore(object):
 
 
 class CraftBeerPI(object):
+
+    _logger_configuration_file = './config/logger.yaml'
+
     cache = {}
     eventbus = {}
 
     def __init__(self):
-        logging.config.dictConfig(yaml.load(open('./config/logger.yaml', 'r')))
+        if os.path.isfile(self._logger_configuration_file):
+            logging.config.dictConfig(yaml.load(open(self._logger_configuration_file, 'r')))
+
         self.logger = logging.getLogger(__name__)
         self.logger.info("Logger got initialized.")
 
diff --git a/modules/logs/__init__.py b/modules/logs/__init__.py
index d3dfc4e..0193261 100755
--- a/modules/logs/__init__.py
+++ b/modules/logs/__init__.py
@@ -7,6 +7,8 @@ from modules.core.core import cbpi
 
 class LogView(FlaskView):
 
+    _log_directory = "./logs"
+
     @route('/', methods=['GET'])
     def get_all_logfiles(self):
         """
@@ -19,7 +21,7 @@ class LogView(FlaskView):
             description: List of all log files
         """
         result = []
-        for filename in os.listdir("./logs"):
+        for filename in os.listdir(self._log_directory):
             if filename.endswith(".log"):
                 result.append(filename)
         return json.dumps(result)
diff --git a/tests/logs/test_log_view.py b/tests/logs/test_log_view.py
new file mode 100644
index 0000000..6e0c46e
--- /dev/null
+++ b/tests/logs/test_log_view.py
@@ -0,0 +1,19 @@
+import unittest
+
+from modules.logs import LogView
+
+
+class TestLogView(unittest.TestCase):
+
+    def test_get_all_logfiles(self):
+        LogView._log_directory = "../../logs"
+
+        log_view = LogView()
+        logfiles = log_view.get_all_logfiles()
+
+        print(logfiles)
+        self.assertTrue(len(logfiles) > 0)
+
+
+if __name__ == '__main__':
+    unittest.main()