This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7947

py3: conditionalize test-lfs-serve-access.t for Python 3.8
ClosedPublic

Authored by indygreg on Jan 18 2020, 4:18 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGbf5a73243cd5: py3: conditionalize test-lfs-serve-access.t for Python 3.8
rHG047ededd65ab: py3: conditionalize test-lfs-serve-access.t for Python 3.8

Summary

This is another case where Python 3.8's traceback printing
varies subtly from older Python versions. Again, I'm not sure
why. But this is apparently the new behavior.

With this change, test-lfs-serve-access.t now passes on Python
3.8!

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

indygreg created this revision.Jan 18 2020, 4:18 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJan 18 2020, 4:18 PM

Herald added subscribers: mercurial-devel, mjpieters. · View Herald Transcript

indygreg added a child revision: D7948: debugcommands: move away from line buffered output on binary stream.Jan 18 2020, 4:18 PM

pulkit accepted this revision.Jan 21 2020, 7:25 AM

This revision is now accepted and ready to land.Jan 21 2020, 7:25 AM

indygreg added a commit: rHG047ededd65ab: py3: conditionalize test-lfs-serve-access.t for Python 3.8.Jan 21 2020, 8:03 AM

Closed by commit rHG047ededd65ab: py3: conditionalize test-lfs-serve-access.t for Python 3.8 (authored by indygreg). · Explain Why

This revision was automatically updated to reflect the committed changes.

indygreg added a commit: rHGbf5a73243cd5: py3: conditionalize test-lfs-serve-access.t for Python 3.8.Jan 21 2020, 11:26 AM

Revision Contents
Changeset List

			Path	Packages
M			tests/test-lfs-serve-access.t (12 lines)

Commit	Parents	Author	Summary	Date
0deade16fc52	302d21e0cdec	Gregory Szorc		Jan 18 2020, 1:43 PM

Status	Author	Revision
Closed	indygreg	D7949 py3: suppress unraisable exceptions in test-worker.t
Closed	indygreg	D7948 debugcommands: move away from line buffered output on binary stream
Closed	indygreg	D7947 py3: conditionalize test-lfs-serve-access.t for Python 3.8
Closed	indygreg	D7946 py3: add extra traceback line present on Python 3.8
Closed	indygreg	D7945 py3: conditionalize test-flagprocessor.t on Python 3.8
Closed	indygreg	D7944 localrepo: handle ValueError during repository opening
Closed	indygreg	D7943 tests: conditionalize test-hightlight.t on pygments version
Accepted	indygreg	D7942 py3: make test-http-bad-server.t conditional on Python 3.6+
Accepted	indygreg	D7941 py3: wallpaper over demand importer differences on Python 3.5
Needs Revision	indygreg	D7940 py3: make flush() line optional
Closed	indygreg	D7939 py3: glob over exception in test-check-py3-compat.t
Closed	indygreg	D7938 py3: string normalization and I/O tweaks in test-lfs.t

Diff 19451

tests/test-lfs-serve-access.t

	$LOCALIP - - [$ERRDATE$] HG error: verifies = store.verify(oid) (glob)			$LOCALIP - - [$ERRDATE$] HG error: verifies = store.verify(oid) (glob)
	$LOCALIP - - [$ERRDATE$] HG error: raise IOError(errno.EIO, r'%s: I/O error' % oid.decode("utf-8")) (glob)			$LOCALIP - - [$ERRDATE$] HG error: raise IOError(errno.EIO, r'%s: I/O error' % oid.decode("utf-8")) (glob)
	$LOCALIP - - [$ERRDATE$] HG error: Error: [Errno ] b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c: I/O error (glob)			$LOCALIP - - [$ERRDATE$] HG error: Error: [Errno ] b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c: I/O error (glob)
	$LOCALIP - - [$ERRDATE$] HG error: (glob)			$LOCALIP - - [$ERRDATE$] HG error: (glob)
	$LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.hg/lfs/objects/b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c': (glob)			$LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.hg/lfs/objects/b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c': (glob)
	$LOCALIP - - [$ERRDATE$] HG error: Traceback (most recent call last): (glob)			$LOCALIP - - [$ERRDATE$] HG error: Traceback (most recent call last): (glob)
	$LOCALIP - - [$ERRDATE$] HG error: localstore.download(oid, req.bodyfh, req.headers[b'Content-Length'])			$LOCALIP - - [$ERRDATE$] HG error: localstore.download(oid, req.bodyfh, req.headers[b'Content-Length'])
	$LOCALIP - - [$ERRDATE$] HG error: super(badstore, self).download(oid, src, contentlength)			$LOCALIP - - [$ERRDATE$] HG error: super(badstore, self).download(oid, src, contentlength)
	$LOCALIP - - [$ERRDATE$] HG error: _(b'corrupt remote lfs object: %s') % oid (glob)			$LOCALIP - - [$ERRDATE$] HG error: raise LfsCorruptionError( (glob) (py38 !)
				$LOCALIP - - [$ERRDATE$] HG error: _(b'corrupt remote lfs object: %s') % oid (glob) (no-py38 !)
	$LOCALIP - - [$ERRDATE$] HG error: LfsCorruptionError: corrupt remote lfs object: b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c (no-py3 !)			$LOCALIP - - [$ERRDATE$] HG error: LfsCorruptionError: corrupt remote lfs object: b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c (no-py3 !)
	$LOCALIP - - [$ERRDATE$] HG error: hgext.lfs.blobstore.LfsCorruptionError: corrupt remote lfs object: b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c (py3 !)			$LOCALIP - - [$ERRDATE$] HG error: hgext.lfs.blobstore.LfsCorruptionError: corrupt remote lfs object: b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c (py3 !)
	$LOCALIP - - [$ERRDATE$] HG error: (glob)			$LOCALIP - - [$ERRDATE$] HG error: (glob)
	$LOCALIP - - [$ERRDATE$] Exception happened during processing request '/.hg/lfs/objects/276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d': (glob)			$LOCALIP - - [$ERRDATE$] Exception happened during processing request '/.hg/lfs/objects/276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d': (glob)
	Traceback (most recent call last):			Traceback (most recent call last):
	self.do_write()			self.do_write()
	self.do_hgweb()			self.do_hgweb()
	for chunk in self.server.application(env, self._start_response):			for chunk in self.server.application(env, self._start_response):
	for r in self._runwsgi(req, res, repo):			for r in self._runwsgi(req, res, repo):
	rctx, req, res, self.check_perm			handled = wireprotoserver.handlewsgirequest( (py38 !)
				return _processbasictransfer( (py38 !)
				rctx, req, res, self.check_perm (no-py38 !)
	return func((args + a), *kw) (no-py3 !)			return func((args + a), *kw) (no-py3 !)
	rctx.repo, req, res, lambda perm: checkperm(rctx, req, perm)			rctx.repo, req, res, lambda perm: checkperm(rctx, req, perm) (no-py38 !)
	res.setbodybytes(localstore.read(oid))			res.setbodybytes(localstore.read(oid))
	blob = self._read(self.vfs, oid, verify)			blob = self._read(self.vfs, oid, verify)
	raise IOError(errno.EIO, r'%s: I/O error' % oid.decode("utf-8"))			raise IOError(errno.EIO, r'%s: I/O error' % oid.decode("utf-8"))
	Error: [Errno ] 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d: I/O error (glob)			Error: [Errno ] 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d: I/O error (glob)

	$LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.hg/lfs/objects/276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d': (glob)			$LOCALIP - - [$ERRDATE$] HG error: Exception happened while processing request '/.hg/lfs/objects/276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d': (glob)
	$LOCALIP - - [$ERRDATE$] HG error: Traceback (most recent call last): (glob)			$LOCALIP - - [$ERRDATE$] HG error: Traceback (most recent call last): (glob)
	$LOCALIP - - [$ERRDATE$] HG error: res.setbodybytes(localstore.read(oid)) (glob)			$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: blob = self._read(self.vfs, oid, verify) (glob)
	$LOCALIP - - [$ERRDATE$] HG error: blobstore._verify(oid, b'dummy content') (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: raise LfsCorruptionError( (glob) (py38 !)
				$LOCALIP - - [$ERRDATE$] HG error: hint=_(b'run hg verify'), (glob) (no-py38 !)
	$LOCALIP - - [$ERRDATE$] HG error: LfsCorruptionError: detected corrupt lfs object: 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d (no-py3 !)			$LOCALIP - - [$ERRDATE$] HG error: LfsCorruptionError: detected corrupt lfs object: 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d (no-py3 !)
	$LOCALIP - - [$ERRDATE$] HG error: hgext.lfs.blobstore.LfsCorruptionError: detected corrupt lfs object: 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d (py3 !)			$LOCALIP - - [$ERRDATE$] HG error: hgext.lfs.blobstore.LfsCorruptionError: detected corrupt lfs object: 276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d (py3 !)
	$LOCALIP - - [$ERRDATE$] HG error: (glob)			$LOCALIP - - [$ERRDATE$] HG error: (glob)

	Basic Authorization headers are returned by the Batch API, and sent back with			Basic Authorization headers are returned by the Batch API, and sent back with
	the GET/PUT request.			the GET/PUT request.

	$ rm -f $TESTTMP/access.log $TESTTMP/errors.log			$ rm -f $TESTTMP/access.log $TESTTMP/errors.log

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	19451		Jan 18 2020, 4:18 PM	★	★
Diff 2	19470	rHG047ededd65abca2d36a32d85a728c9a155942e4b	Jan 18 2020, 1:43 PM	★	★