Merge pull request #165 from colab/fix_settings_d_test_issue

Fixing local settings.d import on tests

colab/utils/conf.py

@@ -55,6 +55,7 @@ def _load_py_file(py_path, path):
 
 
 def load_py_settings(settings_dir='/etc/colab/settings.d'):
+    settings_dir = os.getenv('COLAB_SETTINGS_DIR', settings_dir)
     settings_file = os.getenv('COLAB_SETTINGS', '/etc/colab/settings.py')
     settings_module = settings_file.split('.')[-2].split('/')[-1]
     py_path = "/".join(settings_file.split('/')[:-1])

colab/utils/tests/test_conf.py

@@ -1,4 +1,5 @@
 import sys
+import os
 
 from django.test import TestCase, override_settings, Client
 from django.conf import settings
@@ -49,8 +50,12 @@ def test_load_py_file(self):
     def test_load_py_settings_with_inaccessible_settings(self, mock):
         self.assertRaises(InaccessibleSettings, load_py_settings)
 
-    @patch('os.getenv', return_value=test_files_dir + '/colab_settings.py')
-    def test_load_py_settings_without_settings_d(self, mock):
+    def test_load_py_settings_without_settings_d(self):
+        COLAB_SETTINGS_DIR = ''
+        if 'COLAB_SETTINGS_DIR' in os.environ:
+            COLAB_SETTINGS_DIR = os.environ['COLAB_SETTINGS_DIR']
+            del os.environ['COLAB_SETTINGS_DIR']
+
         py_settings = load_py_settings('/path/fake/settings.d/test.py')
 
         self.assertIn('SOCIAL_NETWORK_ENABLED', py_settings)
@@ -59,6 +64,9 @@ def test_load_py_settings_without_settings_d(self, mock):
         self.assertIn('EMAIL_PORT', py_settings)
         self.assertEquals(py_settings['EMAIL_PORT'], 25)
 
+        if COLAB_SETTINGS_DIR:
+            os.environ['COLAB_SETTINGS_DIR'] = COLAB_SETTINGS_DIR
+
     @patch('os.listdir', return_value=[test_files_dir + '/settings.d/test.py',
                                        'non_python_file'])
     @patch('colab.utils.conf._load_py_file',

tests/run.py

@@ -5,6 +5,7 @@
 
 os.environ['DJANGO_SETTINGS_MODULE'] = 'colab.settings'
 os.environ['COLAB_SETTINGS'] = 'tests/colab_settings.py'
+os.environ['COLAB_SETTINGS_DIR'] = 'tests/settings.d'
 os.environ['COLAB_WIDGETS_SETTINGS'] = 'tests/widgets_settings.py'
 os.environ['COLAB_PLUGINS'] = 'tests/plugins.d'
 os.environ['COLAB_WIDGETS'] = 'tests/widgets.d'