Merge lp:~soren/surveilr/config into lp:surveilr

[Soren Hansen]

Move config override magic for tests into common test class.

=== modified file 'setup.py'
--- setup.py	2011-11-16 09:15:46 +0000
+++ setup.py	2011-11-29 23:26:26 +0000
@@ -31,6 +31,7 @@
     packages=['surveilr'],
     install_requires=['riakalchemy'],
     test_suite='nose.collector',
+    install_package_data=True,
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
         'Environment :: Console',

=== modified file 'surveilr/tests/__init__.py'
--- surveilr/tests/__init__.py	2011-11-22 08:51:25 +0000
+++ surveilr/tests/__init__.py	2011-11-29 23:26:26 +0000
@@ -17,3 +17,37 @@
     License along with this program.  If not, see
     <http://www.gnu.org/licenses/>.
 """
+
+import mock
+import os.path
+import unittest
+
+from surveilr import config
+
+class TestCase(unittest.TestCase):
+    def config_files(self):
+        module = self.__module__
+        if not module.startswith('surveilr.tests'):
+            return
+
+        cfg_file = '%s.cfg' % (os.path.join(os.path.dirname(__file__),
+                                            *module.split('.')[2:]),)
+        return [cfg_file]
+
+    def defaults_file(self):
+        return os.path.join(os.path.dirname(__file__),
+                            os.path.pardir, 'defaults.cfg')
+
+    def setUp(self):
+        super(TestCase, self).setUp()
+        with mock.patch('surveilr.config.defaults_file') as defaults_file:
+            with mock.patch('surveilr.config.config_files') as config_files:
+                config_files.return_value = self.config_files()
+                defaults_file.return_value = self.defaults_file()
+
+                config.load_default_config()
+
+    def tearDown(self):
+        config.load_default_config()
+
+

=== modified file 'surveilr/tests/test_config.py'
--- surveilr/tests/test_config.py	2011-11-28 22:18:35 +0000
+++ surveilr/tests/test_config.py	2011-11-29 23:26:26 +0000
@@ -21,31 +21,16 @@
 """
 
 from surveilr import config
+from surveilr import tests
 
-import mock
 import os.path
-import unittest
-
-
-class ConfigTest(unittest.TestCase):
-    def config_files(self):
-        return []
-
+
+
+class ConfigTest(tests.TestCase):
     def defaults_file(self):
         return os.path.join(os.path.dirname(__file__),
                             'test_config_defaults.cfg')
 
-    def setUp(self):
-        with mock.patch('surveilr.config.defaults_file') as defaults_file:
-            with mock.patch('surveilr.config.config_files') as config_files:
-                config_files.return_value = self.config_files()
-                defaults_file.return_value = self.defaults_file()
-
-                config.load_default_config()
-
-    def tearDown(self):
-        config.load_default_config()
-
 
 class ConfigCoercionTests(ConfigTest):
     def test_str(self):