# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1297762829 -3600
# Node ID cd432ceb6544d0abbc462e90d7026b2deabc0538
# Parent  0738a9d72c57fa131834610d83cf5448f7d1e287# Parent  0b9f0c42b5660a8c5aa59e6e3f62fa4ca4fcff25
Merge with stable

diff -r 0738a9d72c57 -r cd432ceb6544 tests/run-tests.py
--- a/tests/run-tests.py	Fri Feb 11 04:55:00 2011 +0100
+++ b/tests/run-tests.py	Tue Feb 15 10:40:29 2011 +0100
@@ -231,6 +231,8 @@
                 if line and not line.startswith('#'):
                     blacklist[line] = filename
 
+            f.close()
+
         options.blacklist = blacklist
 
     return (options, args)
@@ -491,6 +493,8 @@
             # non-command/result - queue up for merged output
             after.setdefault(pos, []).append(l)
 
+    t.close()
+
     script.append('echo %s %s $?\n' % (salt, n + 1))
 
     fd, name = tempfile.mkstemp(suffix='hg-tst')
@@ -927,7 +931,9 @@
                 continue
 
             if options.keywords:
-                t = open(test).read().lower() + test.lower()
+                fp = open(test)
+                t = fp.read().lower() + test.lower()
+                fp.close()
                 for k in options.keywords.lower().split():
                     if k in t:
                         break