This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7940

py3: make flush() line optional
Needs RevisionPublic

Authored by indygreg on Jan 18 2020, 2:42 AM.

Details

Reviewers
pulkit
marmoute
Group Reviewers
hg-reviewers
Summary

This line only appears on Python 3.5, not on 2.7 or 3.6+. Why, I have
no clue. I suspect a weird regression in the bowels of Python's
I/O system.

Our test format doesn't support combining conditionals. So I add
pyexactXY checks to check for an exact major.minor Python version.
Sadly, this won't be the only test requiring an exception for
Python 3.5.

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, 2:42 AM
pulkit accepted this revision.Jan 20 2020, 8:58 AM
This revision is now accepted and ready to land.Jan 20 2020, 8:58 AM
pulkit added inline comments.Jan 20 2020, 9:03 AM
tests/test-ssh-proto.t
114

Reviewing later patches, I see that (py3 no-py3.6) can be used for this.

marmoute requested changes to this revision.Feb 5 2020, 6:06 PM
marmoute added a subscriber: marmoute.
marmoute added inline comments.
tests/hghave.py
783

can we pre-generate more python version ? It help running "current" extension test againts "older" mercurial version.

tests/test-ssh-proto.t
114

+1 are we missing anything that prevent this to be used?

This revision now requires changes to proceed.Feb 5 2020, 6:06 PM

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (8 lines)
Mtests/test-ssh-proto.t (4 lines)

Diff 19444

tests/hghave.py

@checkvers("py", "Python >= %s", (2.7, 3.5, 3.6, 3.7, 3.8, 3.9)) @checkvers("py", "Python >= %s", (2.7, 3.5, 3.6, 3.7, 3.8, 3.9))
def has_python_range(v): def has_python_range(v):
major, minor = v.split('.')[0:2] major, minor = v.split('.')[0:2]
py_major, py_minor = sys.version_info.major, sys.version_info.minor py_major, py_minor = sys.version_info.major, sys.version_info.minor
return (py_major, py_minor) >= (int(major), int(minor)) return (py_major, py_minor) >= (int(major), int(minor))
@checkvers("pyexact", "Python == %s", (2.7, 3.5, 3.6, 3.7, 3.8, 3.9))
marmouteUnsubmitted
Not Done

can we pre-generate more python version ? It help running "current" extension test againts "older" mercurial version.

marmoute: can we pre-generate more python version ? It help running "current" extension test againts…
def has_python_exact(v):
major, minor = v.split(".")[0:2]
py_major, py_minor = sys.version_info.major, sys.version_info.minor
return (py_major, py_minor) == (int(major), int(minor))
@check("py3", "running with Python 3.x") @check("py3", "running with Python 3.x")
def has_py3(): def has_py3():
return 3 == sys.version_info[0] return 3 == sys.version_info[0]
@check("py3exe", "a Python 3.x interpreter is available") @check("py3exe", "a Python 3.x interpreter is available")
def has_python3exe(): def has_python3exe():
return matchoutput('python3 -V', br'^Python 3.(5|6|7|8|9)') return matchoutput('python3 -V', br'^Python 3.(5|6|7|8|9)')

tests/test-ssh-proto.t

> EOF > EOF
e> flush() -> None e> flush() -> None
o> write(4) -> 4: o> write(4) -> 4:
o> 440\n o> 440\n
o> write(440) -> 440: o> write(440) -> 440:
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
440 440
capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
o> flush() -> None o> flush() -> None (no-pyexact35 !)
pulkitUnsubmitted
Not Done

Reviewing later patches, I see that (py3 no-py3.6) can be used for this.

pulkit: Reviewing later patches, I see that `(py3 no-py3.6)` can be used for this.
marmouteUnsubmitted
Not Done

+1 are we missing anything that prevent this to be used?

marmoute: +1 are we missing anything that prevent this to be used?
$ hg debugserve --sshstdio --logiofile $TESTTMP/io << EOF $ hg debugserve --sshstdio --logiofile $TESTTMP/io << EOF
> hello > hello
> EOF > EOF
440 440
capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
$ cat $TESTTMP/io $ cat $TESTTMP/io
e> flush() -> None e> flush() -> None
o> write(4) -> 4: o> write(4) -> 4:
o> 440\n o> 440\n
o> write(440) -> 440: o> write(440) -> 440:
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n
o> flush() -> None o> flush() -> None (no-pyexact35 !)
$ cd .. $ cd ..
>=0.9.1 clients send a "hello" + "between" for the null range as part of handshake. >=0.9.1 clients send a "hello" + "between" for the null range as part of handshake.
Server should reply with capabilities and should send "1\n\n" as a successful Server should reply with capabilities and should send "1\n\n" as a successful
reply with empty response to the "between". reply with empty response to the "between".
$ hg -R server debugwireproto --localssh --peer raw << EOF $ hg -R server debugwireproto --localssh --peer raw << EOF