From d0536312864f2bc52d7dae744283dcac2a6dd002 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Sat, 12 Dec 2009 18:48:20 +0000 Subject: [1.1.X] Fixed the tests I broke with [11825]. Backport of r11828. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11829 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/settings/__init__.py | 0 tests/regressiontests/settings/models.py | 0 tests/regressiontests/settings/tests.py | 17 ----------------- tests/regressiontests/settings_tests/__init__.py | 0 tests/regressiontests/settings_tests/models.py | 0 tests/regressiontests/settings_tests/tests.py | 17 +++++++++++++++++ 6 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 tests/regressiontests/settings/__init__.py delete mode 100644 tests/regressiontests/settings/models.py delete mode 100644 tests/regressiontests/settings/tests.py create mode 100644 tests/regressiontests/settings_tests/__init__.py create mode 100644 tests/regressiontests/settings_tests/models.py create mode 100644 tests/regressiontests/settings_tests/tests.py diff --git a/tests/regressiontests/settings/__init__.py b/tests/regressiontests/settings/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/regressiontests/settings/models.py b/tests/regressiontests/settings/models.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/regressiontests/settings/tests.py b/tests/regressiontests/settings/tests.py deleted file mode 100644 index fa217b1d79..0000000000 --- a/tests/regressiontests/settings/tests.py +++ /dev/null @@ -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') diff --git a/tests/regressiontests/settings_tests/__init__.py b/tests/regressiontests/settings_tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/regressiontests/settings_tests/models.py b/tests/regressiontests/settings_tests/models.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/regressiontests/settings_tests/tests.py b/tests/regressiontests/settings_tests/tests.py new file mode 100644 index 0000000000..fa217b1d79 --- /dev/null +++ b/tests/regressiontests/settings_tests/tests.py @@ -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') -- cgit v1.3