aboutsummaryrefslogtreecommitdiff
path: root/budget/merged_settings.py
diff options
context:
space:
mode:
authorJocelyn Delande <jocelyn@crapouillou.net>2015-08-18 19:06:24 +0200
committerJocelyn Delande <jocelyn@crapouillou.net>2016-04-03 22:31:32 +0200
commitb685fa74d641ceeb077005698cc63108350f1d36 (patch)
tree724d03e09ff6aa189dc6e67ca9be505b5fcfaea5 /budget/merged_settings.py
parenta8841f9d3f90ec4c1915493a1b34fa1798895772 (diff)
downloadihatemoney-mirror-b685fa74d641ceeb077005698cc63108350f1d36.zip
ihatemoney-mirror-b685fa74d641ceeb077005698cc63108350f1d36.tar.gz
ihatemoney-mirror-b685fa74d641ceeb077005698cc63108350f1d36.tar.bz2
Do not load user-overriden settings in unit tests.
Loading not versioned settings.py during tests make them less predictable. That's inspired from django behaviour with DJANGO_SETTING_MODULE environment variable.
Diffstat (limited to 'budget/merged_settings.py')
-rw-r--r--budget/merged_settings.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/budget/merged_settings.py b/budget/merged_settings.py
new file mode 100644
index 0000000..f6b1f81
--- /dev/null
+++ b/budget/merged_settings.py
@@ -0,0 +1,10 @@
+"""
+Merges default settings with user-defined settings
+"""
+
+from default_settings import *
+
+try:
+ from settings import *
+except ImportError:
+ pass