This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7945

py3: conditionalize test-flagprocessor.t on 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

rHG35cd52c4a5cc: py3: conditionalize test-flagprocessor.t on Python 3.8
rHGfeb3b4d1985a: py3: conditionalize test-flagprocessor.t on Python 3.8

Summary

For reasons I don't understand, Python 3.8 is outputting a different
lint in the traceback than prior Pythons.

The lines in question are:

flagutil.addflagprocessor(
    REVIDX_NOOP, (noopdonothingread, noopdonothing, validatehash,)
)

Python <3.8 prints the 2nd line but 3.8 the first line. Perhaps Python
changed its traceback logic to always print the first line of a
multiple line expression?

Whatever the case, with this change, the test now passes on
Python 3.8.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

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: D7946: py3: add extra traceback line present on Python 3.8.Jan 18 2020, 4:18 PM

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

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

indygreg added a commit: rHGfeb3b4d1985a: py3: conditionalize test-flagprocessor.t on Python 3.8.Jan 21 2020, 8:03 AM

Closed by commit rHGfeb3b4d1985a: py3: conditionalize test-flagprocessor.t on Python 3.8 (authored by indygreg). · Explain Why

This revision was automatically updated to reflect the committed changes.

indygreg added a commit: rHG35cd52c4a5cc: py3: conditionalize test-flagprocessor.t on Python 3.8.Jan 21 2020, 11:26 AM

Revision Contents
Changeset List

			Path	Packages
M			tests/test-flagprocessor.t (3 lines)

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 19468

tests/test-flagprocessor.t

	> extension=$TESTDIR/flagprocessorext.py			> extension=$TESTDIR/flagprocessorext.py
	> duplicate=$TESTDIR/flagprocessorext.py			> duplicate=$TESTDIR/flagprocessorext.py
	> EOF			> EOF
	$ hg debugrebuilddirstate			$ hg debugrebuilddirstate
	Traceback (most recent call last):			Traceback (most recent call last):
	File "/mercurial/extensions.py", line , in _runextsetup (glob)			File "/mercurial/extensions.py", line , in _runextsetup (glob)
	extsetup(ui)			extsetup(ui)
	File "/tests/flagprocessorext.py", line , in extsetup (glob)			File "/tests/flagprocessorext.py", line , in extsetup (glob)
	REVIDX_NOOP, (noopdonothingread, noopdonothing, validatehash,)			flagutil.addflagprocessor( (py38 !)
				REVIDX_NOOP, (noopdonothingread, noopdonothing, validatehash,) (no-py38 !)
	File "/mercurial/revlogutils/flagutil.py", line , in addflagprocessor (glob)			File "/mercurial/revlogutils/flagutil.py", line , in addflagprocessor (glob)
	insertflagprocessor(flag, processor, flagprocessors)			insertflagprocessor(flag, processor, flagprocessors)
	File "/mercurial/revlogutils/flagutil.py", line , in insertflagprocessor (glob)			File "/mercurial/revlogutils/flagutil.py", line , in insertflagprocessor (glob)
	raise error.Abort(msg)			raise error.Abort(msg)
	mercurial.error.Abort: cannot register multiple processors on flag '0x8'. (py3 !)			mercurial.error.Abort: cannot register multiple processors on flag '0x8'. (py3 !)
	Abort: cannot register multiple processors on flag '0x8'. (no-py3 !)			Abort: cannot register multiple processors on flag '0x8'. (no-py3 !)
	*** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'.			*** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'.
	$ hg st 2>&1 \| egrep 'cannot register multiple processors\|flagprocessorext'			$ hg st 2>&1 \| egrep 'cannot register multiple processors\|flagprocessorext'

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	19449		Jan 18 2020, 4:18 PM	★	★
Diff 2	19468	rHGfeb3b4d1985a7ba336accd7c8986cbd9b4f7ff7c	Jan 18 2020, 1:12 PM	★	★