mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

Replaced 'raise SkipTest' with self.skipTest() in a few tests.

Browse Source
This commit is contained in:
Tim Graham 2016-08-16 16:42:27 -04:00 committed by GitHub
parent 4f5b7eeb53
commit 5a41ca79dc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/i18n/test_compilation.py
View File

@ -156,7 +156,7 @@ class CompilationErrorHandling(MessageCompilationTests):
else: else:
cmd = MakeMessagesCommand() cmd = MakeMessagesCommand()
if cmd.gettext_version < (0, 18, 3): if cmd.gettext_version < (0, 18, 3):
raise unittest.SkipTest("python-brace-format is a recent gettext addition.") self.skipTest("python-brace-format is a recent gettext addition.")
with self.assertRaisesMessage(CommandError, "' cannot start a field name"): with self.assertRaisesMessage(CommandError, "' cannot start a field name"):
call_command('compilemessages', locale=['ko'], verbosity=0) call_command('compilemessages', locale=['ko'], verbosity=0)

6
tests/i18n/test_extraction.py
View File

@ -7,7 +7,7 @@ import re
import shutil import shutil
import time import time
import warnings import warnings
from unittest import SkipTest, skipUnless from unittest import skipUnless
from django.core import management from django.core import management
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line
@ -498,7 +498,7 @@ class SymlinkExtractorTests(ExtractorTests):
try: try:
os.symlink(os.path.join(self.test_dir, 'templates'), self.symlinked_dir) os.symlink(os.path.join(self.test_dir, 'templates'), self.symlinked_dir)
except (OSError, NotImplementedError): except (OSError, NotImplementedError):
raise SkipTest("os.symlink() is available on this OS but can't be used by this user.") self.skipTest("os.symlink() is available on this OS but can't be used by this user.")
os.chdir(self.test_dir) os.chdir(self.test_dir)
management.call_command('makemessages', locale=[LOCALE], verbosity=0, symlinks=True) management.call_command('makemessages', locale=[LOCALE], verbosity=0, symlinks=True)
self.assertTrue(os.path.exists(self.PO_FILE)) self.assertTrue(os.path.exists(self.PO_FILE))
@ -507,7 +507,7 @@ class SymlinkExtractorTests(ExtractorTests):
self.assertMsgId('This literal should be included.', po_contents) self.assertMsgId('This literal should be included.', po_contents)
self.assertLocationCommentPresent(self.PO_FILE, None, 'templates_symlinked', 'test.html') self.assertLocationCommentPresent(self.PO_FILE, None, 'templates_symlinked', 'test.html')
else: else:
raise SkipTest("os.symlink() not available on this OS + Python version combination.") self.skipTest("os.symlink() not available on this OS + Python version combination.")
class CopyPluralFormsExtractorTests(ExtractorTests): class CopyPluralFormsExtractorTests(ExtractorTests):

2
tests/utils_tests/test_timezone.py
View File

@ -46,7 +46,7 @@ class TimezoneTests(SimpleTestCase):
except (OverflowError, ValueError) as exc: except (OverflowError, ValueError) as exc:
self.assertIn("install pytz", exc.args[0]) self.assertIn("install pytz", exc.args[0])
else: else:
raise unittest.SkipTest("Failed to trigger an OverflowError or ValueError") self.skipTest("Failed to trigger an OverflowError or ValueError")
def test_now(self): def test_now(self):
with override_settings(USE_TZ=True): with override_settings(USE_TZ=True):