test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed settings override in mail regression tests 

self.settings_override from test subclasses were overwriting parent
attribute.
This commit is contained in:
Claude Paroz 2012-06-02 19:44:06 +02:00
parent f65e412abd
commit ade44b8d40
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/regressiontests/mail/tests.py
View File

@ -500,14 +500,14 @@ class FileBackendTests(BaseEmailBackendTests, TestCase):
email_backend = 'django.core.mail.backends.filebased.EmailBackend' email_backend = 'django.core.mail.backends.filebased.EmailBackend'
def setUp(self): def setUp(self):
super(FileBackendTests, self).setUp()
self.tmp_dir = tempfile.mkdtemp() self.tmp_dir = tempfile.mkdtemp()
self.addCleanup(shutil.rmtree, self.tmp_dir) self.addCleanup(shutil.rmtree, self.tmp_dir)
self.settings_override = override_settings(EMAIL_FILE_PATH=self.tmp_dir) self._settings_override = override_settings(EMAIL_FILE_PATH=self.tmp_dir)
self.settings_override.enable() self._settings_override.enable()
super(FileBackendTests, self).setUp()
def tearDown(self): def tearDown(self):
self.settings_override.disable() self._settings_override.disable()
super(FileBackendTests, self).tearDown() super(FileBackendTests, self).tearDown()
def flush_mailbox(self): def flush_mailbox(self):
@ -644,15 +644,15 @@ class SMTPBackendTests(BaseEmailBackendTests, TestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls.server = FakeSMTPServer(('127.0.0.1', 0), None) cls.server = FakeSMTPServer(('127.0.0.1', 0), None)
cls.settings_override = override_settings( cls._settings_override = override_settings(
EMAIL_HOST="127.0.0.1", EMAIL_HOST="127.0.0.1",
EMAIL_PORT=cls.server.socket.getsockname()[1]) EMAIL_PORT=cls.server.socket.getsockname()[1])
cls.settings_override.enable() cls._settings_override.enable()
cls.server.start() cls.server.start()
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
cls.settings_override.disable() cls._settings_override.disable()
cls.server.stop() cls.server.stop()
def setUp(self): def setUp(self):