test-revlog-raw: close file handles explicitly (issue5644) stable
authorYuya Nishihara <yuya@tcha.org>
Wed, 02 Aug 2017 22:58:38 +0900
branchstable
changeset 33623 6788e648efcf
parent 33622 b4793cc8e1c0
child 33624 524b13fc711f
test-revlog-raw: close file handles explicitly (issue5644)
tests/test-revlog-raw.py
--- a/tests/test-revlog-raw.py	Wed Aug 02 22:04:02 2017 +0900
+++ b/tests/test-revlog-raw.py	Wed Aug 02 22:58:38 2017 +0900
@@ -144,12 +144,18 @@
             text = None
             cachedelta = (deltaparent, rlog.revdiff(deltaparent, r))
         flags = rlog.flags(r)
-        ifh = dlog.opener(dlog.indexfile, 'a+')
-        dfh = None
-        if not dlog._inline:
-            dfh = dlog.opener(dlog.datafile, 'a+')
-        dlog._addrevision(rlog.node(r), text, tr, r, p1, p2, flags, cachedelta,
-                          ifh, dfh)
+        ifh = dfh = None
+        try:
+            ifh = dlog.opener(dlog.indexfile, 'a+')
+            if not dlog._inline:
+                dfh = dlog.opener(dlog.datafile, 'a+')
+            dlog._addrevision(rlog.node(r), text, tr, r, p1, p2, flags,
+                              cachedelta, ifh, dfh)
+        finally:
+            if dfh is not None:
+                dfh.close()
+            if ifh is not None:
+                ifh.close()
     return dlog
 
 # Utilities to generate revisions for testing