test logging_file_config

2 files changed, 31 insertions, 2 deletions

diff --git a/pyramid/scripts/common.py b/pyramid/scripts/common.py
index bbf734bd2..dfff26449 100644
--- a/pyramid/scripts/common.py
+++ b/pyramid/scripts/common.py
@@ -2,7 +2,8 @@ import os
 from pyramid.compat import configparser
 from logging.config import fileConfig
 
-def logging_file_config(config_file, fileConfig=fileConfig):
+def logging_file_config(config_file, fileConfig=fileConfig,
+                        configparser=configparser):
     """
     Setup logging via the logging module's fileConfig function with the
     specified ``config_file``, if applicable.
@@ -14,7 +15,7 @@ def logging_file_config(config_file, fileConfig=fileConfig):
     parser.read([config_file])
     if parser.has_section('loggers'):
         config_file = os.path.abspath(config_file)
-        fileConfig(
+        return fileConfig(
             config_file,
             dict(__file__=config_file, here=os.path.dirname(config_file))
             )
diff --git a/pyramid/tests/test_scripts/test_common.py b/pyramid/tests/test_scripts/test_common.py
new file mode 100644
index 000000000..c62483fdc
--- /dev/null
+++ b/pyramid/tests/test_scripts/test_common.py
@@ -0,0 +1,28 @@
+import unittest
+
+class Test_logging_file_config(unittest.TestCase):
+    def _callFUT(self, config_file):
+        from pyramid.scripts.common import logging_file_config
+        dummy_cp = DummyConfigParserModule
+        return logging_file_config(config_file, self.fileConfig, dummy_cp)
+
+    def test_it(self):
+        config_file, dict = self._callFUT('/abc')
+        self.assertEqual(config_file, '/abc')
+        self.assertEqual(dict['__file__'], '/abc')
+        self.assertEqual(dict['here'], '/')
+
+    def fileConfig(self, config_file, dict):
+        return config_file, dict
+
+class DummyConfigParser(object):
+    def read(self, x):
+        pass
+
+    def has_section(self, name):
+        return True
+
+class DummyConfigParserModule(object):
+    ConfigParser = DummyConfigParser
+
+