Merge pull request #568 from naspeh-sf/fix-tests

Allow empty LOG_CONFIG_FILE for tests

superdesk/logging.py

@@ -27,12 +27,17 @@ def item_msg(msg, item):
 
 def configure_logging(file_path):
     """
-    configure logging.
+    Configure logging.
+
     :param str file_path:
     """
+    if not file_path:
+        return
+
     try:
-        logging_conf = open(file_path, 'r')
-        logging_dict = yaml.load(logging_conf)
+        with open(file_path, 'r') as f:
+            logging_dict = yaml.load(f)
+
         logging.config.dictConfig(logging_dict)
     except:
-        logger.error('Cannot load logging config. File: {}'.format(file_path))
+        logger.warn('Cannot load logging config. File: %s', file_path)

superdesk/tests/test_settings.py

@@ -40,7 +40,7 @@ def env(variable, fallback_value=None):
 DATE_FORMAT = '%Y-%m-%dT%H:%M:%S+0000'
 PAGINATION_LIMIT = 200
 
-LOG_CONFIG_FILE = env('LOG_CONFIG_FILE', 'logging_config.yml')
+LOG_CONFIG_FILE = env('LOG_CONFIG_FILE')
 
 APPLICATION_NAME = env('APP_NAME', 'Superdesk')
 server_url = urlparse(env('SUPERDESK_URL', 'http://localhost:5000/api'))