Author: jacob
Date: 2009-12-12 12:45:43 -0600 (Sat, 12 Dec 2009)
New Revision: 11828

Added:
   django/trunk/tests/regressiontests/settings_tests/
   django/trunk/tests/regressiontests/settings_tests/__init__.py
   django/trunk/tests/regressiontests/settings_tests/models.py
   django/trunk/tests/regressiontests/settings_tests/tests.py
Removed:
   django/trunk/tests/regressiontests/settings/__init__.py
   django/trunk/tests/regressiontests/settings/models.py
   django/trunk/tests/regressiontests/settings/tests.py
Log:
Fixed the tests I broke with [11824].

Note to self: naming a module "settings" is a really good way of screwing 
things up.

Deleted: django/trunk/tests/regressiontests/settings/__init__.py
===================================================================

Deleted: django/trunk/tests/regressiontests/settings/models.py
===================================================================

Deleted: django/trunk/tests/regressiontests/settings/tests.py
===================================================================
--- django/trunk/tests/regressiontests/settings/tests.py        2009-12-12 
18:22:09 UTC (rev 11827)
+++ django/trunk/tests/regressiontests/settings/tests.py        2009-12-12 
18:45:43 UTC (rev 11828)
@@ -1,17 +0,0 @@
-import unittest
-from django.conf import settings
-
-class SettingsTests(unittest.TestCase):
-
-    #
-    # Regression tests for #10130: deleting settings.
-    #
-
-    def test_settings_delete(self):
-        settings.TEST = 'test'
-        self.assertEqual('test', settings.TEST)
-        del settings.TEST
-        self.assertRaises(AttributeError, getattr, settings, 'TEST')
-
-    def test_settings_delete_wrapped(self):
-        self.assertRaises(TypeError, delattr, settings, '_wrapped')

Copied: django/trunk/tests/regressiontests/settings_tests/__init__.py (from rev 
11826, django/trunk/tests/regressiontests/settings/__init__.py)
===================================================================

Copied: django/trunk/tests/regressiontests/settings_tests/models.py (from rev 
11826, django/trunk/tests/regressiontests/settings/models.py)
===================================================================

Copied: django/trunk/tests/regressiontests/settings_tests/tests.py (from rev 
11826, django/trunk/tests/regressiontests/settings/tests.py)
===================================================================
--- django/trunk/tests/regressiontests/settings_tests/tests.py                  
        (rev 0)
+++ django/trunk/tests/regressiontests/settings_tests/tests.py  2009-12-12 
18:45:43 UTC (rev 11828)
@@ -0,0 +1,17 @@
+import unittest
+from django.conf import settings
+
+class SettingsTests(unittest.TestCase):
+
+    #
+    # Regression tests for #10130: deleting settings.
+    #
+
+    def test_settings_delete(self):
+        settings.TEST = 'test'
+        self.assertEqual('test', settings.TEST)
+        del settings.TEST
+        self.assertRaises(AttributeError, getattr, settings, 'TEST')
+
+    def test_settings_delete_wrapped(self):
+        self.assertRaises(TypeError, delattr, settings, '_wrapped')

--

You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.


Reply via email to