This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7941

py3: wallpaper over demand importer differences on Python 3.5
AcceptedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Summary

For some reason, Python 3.5 and only Python 3.5's demand importer
is importing extra parent modules. This is causing test output
on 3.5 to diverge.

While I'm not thrilled about the divergence in behavior, I don't
think it is critical enough to warrant fixing in code. So this
commit teaches our test to recognize the divergent behavior on
Python 3.5.

Because the test format doesn't support conditional exit codes and
we were already inside an #if (it also doesn't allow nested #ifs),
I added a || false to normalize the exit code. The actual exit
code shouldn't matter here, as we have tests for that elsewhere.

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, 9:01 AM
pulkit added a subscriber: pulkit.

I added a || false to normalize the exit code.

s/false/true in flight

This revision is now accepted and ready to land.Jan 20 2020, 9:01 AM

Revision Contents
Changeset List

PathPackages
Mtests/test-extension.t (46 lines)

Diff 19445

tests/test-extension.t

> result.append(lfunc()) > result.append(lfunc())
> result.append(absdetail) > result.append(absdetail)
> result.append(legacydetail) > result.append(legacydetail)
> result.append(proxied.detail) > result.append(proxied.detail)
> ui.write(b'LIB: %s\n' % b'\nLIB: '.join(result)) > ui.write(b'LIB: %s\n' % b'\nLIB: '.join(result))
> NO_CHECK_EOF > NO_CHECK_EOF
Examine module importing. Examine module importing.
Python 3.5's lazy module importer varies in behavior from ours and the
$ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.absextroot=$TESTTMP/absextroot showabsolute) one in the standard library at 3.6+. This is not desirable. But it is
LIB: this is extlibroot.lsub1.lsub2.used a corner case in behavior and we don't expect many people to be running
LIB: this is extlibroot.lsub1.lsub2.called.func() into it.
LIB: this is extlibroot.recursedown.abs.used
LIB: this is extlibroot.recursedown.legacy.used $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.absextroot=$TESTTMP/absextroot showabsolute) || true
LIB: this is extlibroot.shadowing.used LIB: this is extlibroot.lsub1.lsub2.used (no-pyexact35 !)
ABS: this is absextroot.xsub1.xsub2.used LIB: this is extlibroot.lsub1.lsub2.called.func() (no-pyexact35 !)
ABS: this is absextroot.xsub1.xsub2.called.func() LIB: this is extlibroot.recursedown.abs.used (no-pyexact35 !)
LIB: this is extlibroot.recursedown.legacy.used (no-pyexact35 !)
$ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.absextroot=$TESTTMP/absextroot showrelative) LIB: this is extlibroot.shadowing.used (no-pyexact35 !)
LIB: this is extlibroot.lsub1.lsub2.used ABS: this is absextroot.xsub1.xsub2.used (no-pyexact35 !)
LIB: this is extlibroot.lsub1.lsub2.called.func() ABS: this is absextroot.xsub1.xsub2.called.func() (no-pyexact35 !)
LIB: this is extlibroot.recursedown.abs.used *** failed to import extension absextroot from $TESTTMP/absextroot: extlibroot.lsub1.lsub2.unused is loaded unintentionally (pyexact35 !)
LIB: this is extlibroot.recursedown.legacy.used hg: unknown command 'showabsolute' (pyexact35 !)
LIB: this is extlibroot.shadowing.used (use 'hg help' for a list of commands) (pyexact35 !)
REL: this is absextroot.xsub1.xsub2.used
REL: this is absextroot.xsub1.xsub2.called.func() $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.absextroot=$TESTTMP/absextroot showrelative) || true
REL: this relimporter imports 'this is absextroot.relimportee' LIB: this is extlibroot.lsub1.lsub2.used (no-pyexact35 !)
LIB: this is extlibroot.lsub1.lsub2.called.func() (no-pyexact35 !)
LIB: this is extlibroot.recursedown.abs.used (no-pyexact35 !)
LIB: this is extlibroot.recursedown.legacy.used (no-pyexact35 !)
LIB: this is extlibroot.shadowing.used (no-pyexact35 !)
REL: this is absextroot.xsub1.xsub2.used (no-pyexact35 !)
REL: this is absextroot.xsub1.xsub2.called.func() (no-pyexact35 !)
REL: this relimporter imports 'this is absextroot.relimportee' (no-pyexact35 !)
*** failed to import extension absextroot from $TESTTMP/absextroot: extlibroot.lsub1.lsub2.unused is loaded unintentionally (pyexact35 !)
hg: unknown command 'showrelative' (pyexact35 !)
(did you mean shelve?) (pyexact35 !)
Examine whether sub-module is imported relatively as expected. Examine whether sub-module is imported relatively as expected.
See also issue5208 for detail about example case on Python 3.x. See also issue5208 for detail about example case on Python 3.x.
$ f -q $TESTTMP/extlibroot/lsub1/lsub2/notexist.py $ f -q $TESTTMP/extlibroot/lsub1/lsub2/notexist.py
$TESTTMP/extlibroot/lsub1/lsub2/notexist.py: file not found $TESTTMP/extlibroot/lsub1/lsub2/notexist.py: file not found