Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-fncache: ensure lock doesn't look held to __del__
authorAugie Fackler <augie@google.com>
Tue, 01 Dec 2015 14:44:08 -0500
changeset 27168 8a829fc84bb3
parent 27167 3fe8cb40c9c5
child 27169 dd214130a4f6
test-fncache: ensure lock doesn't look held to __del__ This was showing a DeprecationWarning on Python 2.6.
tests/test-fncache.t file | annotate | diff | comparison | revisions 
--- a/tests/test-fncache.t	Wed Nov 11 20:07:15 2015 -0500
+++ b/tests/test-fncache.t	Tue Dec 01 14:44:08 2015 -0500
@@ -209,8 +209,10 @@
   > 
   > def lockexception(orig, vfs, lockname, wait, releasefn, *args, **kwargs):
   >     def releasewrap():
+  >         l.held = False # ensure __del__ is a noop
   >         raise error.Abort("forced lock failure")
-  >     return orig(vfs, lockname, wait, releasewrap, *args, **kwargs)
+  >     l = orig(vfs, lockname, wait, releasewrap, *args, **kwargs)
+  >     return l
   > 
   > def reposetup(ui, repo):
   >     wrapfunction(repo, '_lock', lockexception)
@@ -225,7 +227,6 @@
   $ touch y
   $ hg ci -qAm y
   abort: forced lock failure
-  Exception mercurial.error.Abort: Abort('forced lock failure',) in <bound method lock.__del__ of <mercurial.lock.lock object at *>> ignored (glob)
   [255]
   $ cat .hg/store/fncache
   data/y.i
Mercurial