diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2011-02-04 15:45:52 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2011-02-04 15:45:52 +0000 |
| commit | 1a2f9ff9f90fef1ddaff76e1bb5e27e673ccbcc4 (patch) | |
| tree | 579f432ed19c537b5d119c65fa84c5d04cdd01c0 /tests/regressiontests/admin_widgets | |
| parent | 090ff642043a2ca7d69e475f721eab4d68f6572b (diff) | |
Modified a few tests methods to make sure no leaks of activated locale or USE_I10N setting value happen between tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/admin_widgets')
| -rw-r--r-- | tests/regressiontests/admin_widgets/tests.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/regressiontests/admin_widgets/tests.py b/tests/regressiontests/admin_widgets/tests.py index 78e7ba42d9..442fb1ef80 100644 --- a/tests/regressiontests/admin_widgets/tests.py +++ b/tests/regressiontests/admin_widgets/tests.py @@ -210,14 +210,16 @@ class AdminSplitDateTimeWidgetTest(TestCase): activate('de-at') old_USE_L10N = settings.USE_L10N - settings.USE_L10N = True - w.is_localized = True - self.assertEqual( - conditional_escape(w.render('test', datetime(2007, 12, 1, 9, 30))), - '<p class="datetime">Datum: <input value="01.12.2007" type="text" class="vDateField" name="test_0" size="10" /><br />Zeit: <input value="09:30:00" type="text" class="vTimeField" name="test_1" size="8" /></p>', - ) - deactivate() - settings.USE_L10N = old_USE_L10N + try: + settings.USE_L10N = True + w.is_localized = True + self.assertEqual( + conditional_escape(w.render('test', datetime(2007, 12, 1, 9, 30))), + '<p class="datetime">Datum: <input value="01.12.2007" type="text" class="vDateField" name="test_0" size="10" /><br />Zeit: <input value="09:30:00" type="text" class="vTimeField" name="test_1" size="8" /></p>', + ) + finally: + deactivate() + settings.USE_L10N = old_USE_L10N class AdminFileWidgetTest(DjangoTestCase): |