diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-01-20 09:37:07 -0800 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-01-20 09:37:07 -0800 |
| commit | bedacfcb07e35a49780dfbdbf272827db722e8c2 (patch) | |
| tree | 02f80a62cebacfc89d4253ec49ec43c30422acc7 | |
| parent | a604aa80f0e5029f7ae7e0254541f196a41913bb (diff) | |
| parent | 234172e9d289167a228b4b8fde00a85a8c868e3f (diff) | |
| download | askbot-bedacfcb07e35a49780dfbdbf272827db722e8c2.tar.gz askbot-bedacfcb07e35a49780dfbdbf272827db722e8c2.tar.bz2 askbot-bedacfcb07e35a49780dfbdbf272827db722e8c2.zip | |
Merge pull request #108 from rodelrod/fix-skin-tests
Fixed a settings manipulation that was breaking other tests.
| -rw-r--r-- | askbot/tests/skin_tests.py | 5 |
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) |