Update upstream source from tag 'upstream/2018.04.25'

[youtubedl] / test / test_unicode_literals.py

diff --git a/test/test_unicode_literals.py b/test/test_unicode_literals.py
index 7f816698e7b2e20bc982b0eeb9638885edf19b48..6c1b7ec915c60321e62c7c44728f5486921e772f 100644 (file)
--- a/test/test_unicode_literals.py
+++ b/test/test_unicode_literals.py
@@ -17,13 +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):
 
 from test.helper import assertRegexpMatches
 
 
 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