From d2176722244b23f8a0743ef74d4349f73679a874 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 12 Sep 2011 09:16:15 -0700 Subject: [PATCH] Copy the wrapped settings object when creating UserSettingsHolder This is needed otherwise deleted settings don't get added back for later tests --- analytical/tests/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/analytical/tests/utils.py b/analytical/tests/utils.py index 0a0731e..b0dd421 100644 --- a/analytical/tests/utils.py +++ b/analytical/tests/utils.py @@ -4,6 +4,8 @@ Testing utilities. from __future__ import with_statement +import copy + from django.conf import settings, UserSettingsHolder from django.core.management import call_command from django.db.models import loading @@ -79,7 +81,7 @@ class override_settings(object): return inner def enable(self): - override = UserSettingsHolder(settings._wrapped) + override = UserSettingsHolder(copy.copy(settings._wrapped)) for key, new_value in self.options.items(): if new_value is SETTING_DELETED: delattr(override.default_settings, key)