--- a/tests/test-lfs-serve-access.t Sat Oct 05 10:29:34 2019 -0400
+++ b/tests/test-lfs-serve-access.t Sun Oct 06 09:45:02 2019 -0400
@@ -353,7 +353,7 @@
$LOCALIP - - [$ERRDATE$] HG error: Traceback (most recent call last): (glob)
$LOCALIP - - [$ERRDATE$] HG error: localstore.download(oid, req.bodyfh) (glob)
$LOCALIP - - [$ERRDATE$] HG error: super(badstore, self).download(oid, src) (glob)
- $LOCALIP - - [$ERRDATE$] HG error: % oid) (glob)
+ $LOCALIP - - [$ERRDATE$] HG error: _(b'corrupt remote lfs object: %s') % oid (glob)
$LOCALIP - - [$ERRDATE$] HG error: LfsCorruptionError: corrupt remote lfs object: b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c (glob)
$LOCALIP - - [$ERRDATE$] HG error: (glob)
$LOCALIP - - [$ERRDATE$] Exception happened during processing request '/.hg/lfs/objects/276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d': (glob)
@@ -362,9 +362,9 @@
self.do_hgweb()
for chunk in self.server.application(env, self._start_response):
for r in self._runwsgi(req, res, repo):
- rctx, req, res, self.check_perm)
+ rctx, req, res, self.check_perm
return func(*(args + a), **kw) (no-py3 !)
- lambda perm:
+ rctx.repo, req, res, lambda perm: checkperm(rctx, req, perm)
res.setbodybytes(localstore.read(oid))
blob = self._read(self.vfs, oid, verify)
raise IOError(errno.EIO, r'%s: I/O error' % oid.decode("utf-8"))
@@ -375,7 +375,7 @@
$LOCALIP - - [$ERRDATE$] HG error: res.setbodybytes(localstore.read(oid)) (glob)
$LOCALIP - - [$ERRDATE$] HG error: blob = self._read(self.vfs, oid, verify) (glob)
$LOCALIP - - [$ERRDATE$] HG error: blobstore._verify(oid, b'dummy content') (glob)
- $LOCALIP - - [$ERRDATE$] HG error: hint=_(b'run hg verify')) (glob)
+ $LOCALIP - - [$ERRDATE$] HG error: hint=_(b'run hg verify'), (glob)
$LOCALIP - - [$ERRDATE$] HG error: LfsCorruptionError: detected corrupt lfs object: 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d (glob)
$LOCALIP - - [$ERRDATE$] HG error: (glob)