From b685fa74d641ceeb077005698cc63108350f1d36 Mon Sep 17 00:00:00 2001
From: Jocelyn Delande <jocelyn@crapouillou.net>
Date: Tue, 18 Aug 2015 19:06:24 +0200
Subject: 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.
---
 budget/merged_settings.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 budget/merged_settings.py

(limited to 'budget/merged_settings.py')

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
-- 
cgit v1.1