[test_unicode_literals] Fix test

This commit is contained in:
Philipp Hagemeister 2014-12-12 17:06:52 +01:00
parent ff815fe65a
commit 8bdcb436f9
2 changed files with 15 additions and 3 deletions

View File

@ -161,7 +161,9 @@ def assertRegexpMatches(self, text, regexp, msg=None):
else: else:
m = re.match(regexp, text) m = re.match(regexp, text)
if not m: if not m:
note = 'Regexp didn\'t match: %r not found in %r' % (regexp, text) note = 'Regexp didn\'t match: %r not found' % (regexp)
if len(text) < 1000:
note += ' in %r' % text
if msg is None: if msg is None:
msg = note msg = note
else: else:

View File

@ -1,5 +1,11 @@
from __future__ import unicode_literals from __future__ import unicode_literals
# Allow direct execution
import os
import sys
import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import io import io
import os import os
import re import re
@ -14,6 +20,9 @@ IGNORED_FILES = [
] ]
from helper import assertRegexpMatches
class TestUnicodeLiterals(unittest.TestCase): class TestUnicodeLiterals(unittest.TestCase):
def test_all_files(self): def test_all_files(self):
for dirpath, _, filenames in os.walk(rootDir): for dirpath, _, filenames in os.walk(rootDir):
@ -29,9 +38,10 @@ class TestUnicodeLiterals(unittest.TestCase):
if "'" not in code and '"' not in code: if "'" not in code and '"' not in code:
continue continue
self.assertRegexpMatches( assertRegexpMatches(
self,
code, code,
r'(?:#.*\n*)?from __future__ import (?:[a-z_]+,\s*)*unicode_literals', r'(?:(?:#.*?|\s*)\n)*from __future__ import (?:[a-z_]+,\s*)*unicode_literals',
'unicode_literals import missing in %s' % fn) 'unicode_literals import missing in %s' % fn)
m = re.search(r'(?<=\s)u[\'"](?!\)|,|$)', code) m = re.search(r'(?<=\s)u[\'"](?!\)|,|$)', code)