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

Adapted _assertPoLocComment for multi-file source lines in po files 

Refs #17375.
This commit is contained in:
Claude Paroz 2016-04-28 20:37:36 +02:00
parent 7f51876f99
commit 185f90c45f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/i18n/test_extraction.py
View File

@ -107,10 +107,9 @@ class ExtractorTests(SerializeMixin, SimpleTestCase):
else: else:
# #: path/to/file.html:123 # #: path/to/file.html:123
cwd_prefix = '' cwd_prefix = ''
parts = ['#: ']
path = os.path.join(cwd_prefix, *comment_parts) path = os.path.join(cwd_prefix, *comment_parts)
parts.append(path) parts = [path]
if isinstance(line_number, six.string_types): if isinstance(line_number, six.string_types):
line_number = self._get_token_line_number(path, line_number) line_number = self._get_token_line_number(path, line_number)
@ -118,10 +117,18 @@ class ExtractorTests(SerializeMixin, SimpleTestCase):
parts.append(':%d' % line_number) parts.append(':%d' % line_number)
needle = ''.join(parts) needle = ''.join(parts)
pattern = re.compile(r'^\#\:.*' + re.escape(needle), re.MULTILINE)
if assert_presence: if assert_presence:
return self.assertIn(needle, po_contents, '"%s" not found in final .po file.' % needle) return six.assertRegex(self, po_contents, pattern, '"%s" not found in final .po file.' % needle)
else: else:
return self.assertNotIn(needle, po_contents, '"%s" shouldn\'t be in final .po file.' % needle) if six.PY3:
return self.assertNotRegex(
po_contents, pattern, '"%s" shouldn\'t be in final .po file.' % needle
)
else:
return self.assertNotRegexpMatches(
po_contents, pattern, '"%s" shouldn\'t be in final .po file.' % needle
)
def _get_token_line_number(self, path, token): def _get_token_line_number(self, path, token):
with open(path) as f: with open(path) as f:
@ -632,7 +639,7 @@ class LocationCommentsTests(ExtractorTests):
os.chdir(self.test_dir) os.chdir(self.test_dir)
management.call_command('makemessages', locale=[LOCALE], verbosity=0, no_location=True) management.call_command('makemessages', locale=[LOCALE], verbosity=0, no_location=True)
self.assertTrue(os.path.exists(self.PO_FILE)) self.assertTrue(os.path.exists(self.PO_FILE))
self.assertLocationCommentNotPresent(self.PO_FILE, 55, 'templates', 'test.html.py') self.assertLocationCommentNotPresent(self.PO_FILE, None, 'test.html')
def test_no_location_disabled(self): def test_no_location_disabled(self):
"""Behavior is correct if --no-location switch isn't specified.""" """Behavior is correct if --no-location switch isn't specified."""
@ -642,7 +649,7 @@ class LocationCommentsTests(ExtractorTests):
# #16903 -- Standard comment with source file relative path should be present # #16903 -- Standard comment with source file relative path should be present
self.assertLocationCommentPresent(self.PO_FILE, 'Translatable literal #6b', 'templates', 'test.html') self.assertLocationCommentPresent(self.PO_FILE, 'Translatable literal #6b', 'templates', 'test.html')
# #21208 -- Leaky paths in comments on Windows e.g. #: path\to\file.html.py:123 # #21209 -- Leaky paths in comments on Windows e.g. #: path\to\file.html.py:123
self.assertLocationCommentNotPresent(self.PO_FILE, None, 'templates', 'test.html.py') self.assertLocationCommentNotPresent(self.PO_FILE, None, 'templates', 'test.html.py')