projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[motherless] Update tests
[youtube-dl]
/
test
/
test_unicode_literals.py
diff --git
a/test/test_unicode_literals.py
b/test/test_unicode_literals.py
index 2cc431b0be5c58db1aaf9ac2de8e495090089f65..6c1b7ec915c60321e62c7c44728f5486921e772f 100644
(file)
--- a/
test/test_unicode_literals.py
+++ b/
test/test_unicode_literals.py
@@
-1,9
+1,13
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
-import io
+# Allow direct execution
import os
import os
-import
re
+import
sys
import unittest
import unittest
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+import io
+import re
rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@
-13,10
+17,22
@@
IGNORED_FILES = [
'buildserver.py',
]
'buildserver.py',
]
+IGNORED_DIRS = [
+ '.git',
+ '.tox',
+]
+
+from test.helper import assertRegexpMatches
+
class TestUnicodeLiterals(unittest.TestCase):
def test_all_files(self):
class TestUnicodeLiterals(unittest.TestCase):
def test_all_files(self):
- for dirpath, _, filenames in os.walk(rootDir):
+ for dirpath, dirnames, filenames in os.walk(rootDir):
+ for ignore_dir in IGNORED_DIRS:
+ if ignore_dir in dirnames:
+ # If we remove the directory from dirnames os.walk won't
+ # recurse into it
+ dirnames.remove(ignore_dir)
for basename in filenames:
if not basename.endswith('.py'):
continue
for basename in filenames:
if not basename.endswith('.py'):
continue
@@
-29,9
+45,10
@@
class TestUnicodeLiterals(unittest.TestCase):
if "'" not in code and '"' not in code:
continue
if "'" not in code and '"' not in code:
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)
m = re.search(r'(?<=\s)u[\'"](?!\)|,|$)', code)
'unicode_literals import missing in %s' % fn)
m = re.search(r'(?<=\s)u[\'"](?!\)|,|$)', code)