Changeset 391 for python/trunk/Lib/test/test_fnmatch.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_fnmatch.py (modified) (2 diffs)

python/trunk/Lib/test/test_fnmatch.py

@@ -4 +4 @@
 import unittest
 
-from fnmatch import fnmatch, fnmatchcase
+from fnmatch import fnmatch, fnmatchcase, _MAXCACHE, _cache
+from fnmatch import fnmatch, fnmatchcase, _MAXCACHE, _cache, _purge
 
 
 class FnmatchTestCase(unittest.TestCase):
+
+    def tearDown(self):
+        _purge()
+
     def check_match(self, filename, pattern, should_match=1, fn=fnmatch):
         if should_match:
             self.assertTrue(fn(filename, pattern),
-                            "expected %r to match pattern %r"
-                            % (filename, pattern))
+                         "expected %r to match pattern %r"
+                         % (filename, pattern))
         else:
             self.assertTrue(not fn(filename, pattern),
-                            "expected %r not to match pattern %r"
-                            % (filename, pattern))
+                         "expected %r not to match pattern %r"
+                         % (filename, pattern))
 
     def test_fnmatch(self):
@@ -50 +55 @@
         check('abc', 'AbC', 0, fnmatchcase)
 
+    def test_cache_clearing(self):
+        # check that caches do not grow too large
+        # http://bugs.python.org/issue7846
+
+        # string pattern cache
+        for i in range(_MAXCACHE + 1):
+            fnmatch('foo', '?' * i)
+
+        self.assertLessEqual(len(_cache), _MAXCACHE)
 
 def test_main():