summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Daunoravicius <rodelrod@putoperdiz>2013-01-19 14:25:44 +0100
committerRodrigo Daunoravicius <rodelrod@putoperdiz>2013-01-19 15:53:23 +0100
commit234172e9d289167a228b4b8fde00a85a8c868e3f (patch)
treed347f0bc8b17f15e48a6cac431e7220ff15b7643
parent6ad4cb23d6ab24d6d69e2f4523d356b113a79301 (diff)
downloadaskbot-234172e9d289167a228b4b8fde00a85a8c868e3f.tar.gz
askbot-234172e9d289167a228b4b8fde00a85a8c868e3f.tar.bz2
askbot-234172e9d289167a228b4b8fde00a85a8c868e3f.zip
Fixed a settings manipulation that was breaking other tests.
The manipulation of ASKBOT_EXTRA_SKINS was breaking widget_tests and post_model_tests when running the full askbot test suite.
-rw-r--r--askbot/tests/skin_tests.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/askbot/tests/skin_tests.py b/askbot/tests/skin_tests.py
index 8499ab70..96bb7d43 100644
--- a/askbot/tests/skin_tests.py
+++ b/askbot/tests/skin_tests.py
@@ -39,7 +39,10 @@ class SkinTests(TestCase):
)
shutil.rmtree(self.temp_dir)
askbot_settings.update('ASKBOT_DEFAULT_SKIN', 'default')
- django_settings.ASKBOT_EXTRA_SKINS_DIR = self.skins_dir_backup
+ if self.skins_dir_backup is None:
+ del(django_settings.ASKBOT_EXTRA_SKINS_DIR)
+ else:
+ django_settings.ASKBOT_EXTRA_SKINS_DIR = self.skins_dir_backup
def assert_default_logo_in_skin(self, skin_name):
url = skin_utils.get_media_url(askbot_settings.SITE_LOGO_URL)