--- a/tests/test-fncache.t	Tue Oct 06 15:07:00 2015 -0400
+++ b/tests/test-fncache.t	Tue Oct 06 15:55:50 2015 -0700
@@ -205,10 +205,10 @@
   > from mercurial import commands, util
   > from mercurial.extensions import wrapfunction
   > 
-  > def lockexception(orig, vfs, lockname, wait, releasefn, acquirefn, desc, parentenvvar=None):
+  > def lockexception(orig, vfs, lockname, wait, releasefn, *args, **kwargs):
   >     def releasewrap():
   >         raise util.Abort("forced lock failure")
-  >     return orig(vfs, lockname, wait, releasewrap, acquirefn, desc)
+  >     return orig(vfs, lockname, wait, releasewrap, *args, **kwargs)
   > 
   > def reposetup(ui, repo):
   >     wrapfunction(repo, '_lock', lockexception)