This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11861

python2-compat: fix extensions' tests on python2
ClosedPublic

Authored by marmoute on Dec 4 2021, 1:26 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0b2469bf1227: python2-compat: fix extensions' tests on python2
Summary

They are minor output different to be taken in account.

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

marmoute created this revision.Dec 4 2021, 1:26 PM
Alphare accepted this revision.Dec 6 2021, 4:37 AM
Alphare added a subscriber: Alphare.

Thanks

This revision is now accepted and ready to land.Dec 6 2021, 4:37 AM
marmoute added a commit: rHG0b2469bf1227: python2-compat: fix extensions' tests on python2.Dec 6 2021, 4:52 AM
Closed by commit rHG0b2469bf1227: python2-compat: fix extensions' tests on python2 (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-bad-extension.t (12 lines)
Mtests/test-extension.t (5 lines)

Diff 31315

tests/test-bad-extension.t

> hgext.gpg = > hgext.gpg =
> badext = $abspathexc > badext = $abspathexc
> baddocext = $abspathdoc > baddocext = $abspathdoc
> badext2 = > badext2 =
> EOF > EOF
$ hg -q help help 2>&1 |grep extension $ hg -q help help 2>&1 |grep extension
*** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
*** failed to import extension "badext2": No module named 'badext2' *** failed to import extension "badext2": No module named 'badext2' (py3 !)
*** failed to import extension "badext2": No module named badext2 (no-py3 !)
show traceback show traceback
$ hg -q help help --traceback 2>&1 | egrep ' extension|^Exception|Traceback|ImportError|ModuleNotFound' $ hg -q help help --traceback 2>&1 | egrep ' extension|^Exception|Traceback|ImportError|ModuleNotFound'
*** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
Traceback (most recent call last): Traceback (most recent call last):
Exception: bit bucket overflow Exception: bit bucket overflow
*** failed to import extension "badext2": No module named 'badext2' *** failed to import extension "badext2": No module named 'badext2' (py3 !)
*** failed to import extension "badext2": No module named badext2 (no-py3 !)
Traceback (most recent call last): Traceback (most recent call last):
ImportError: No module named badext2 (no-py3 !) ImportError: No module named badext2 (no-py3 !)
ImportError: No module named 'hgext.badext2' (py3 no-py36 !) ImportError: No module named 'hgext.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext.badext2' (py36 !)
Traceback (most recent call last): (py3 !) Traceback (most recent call last): (py3 !)
ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !) ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !)
Traceback (most recent call last): (py3 !) Traceback (most recent call last): (py3 !)
YYYY/MM/DD HH:MM:SS (PID)> - could not import hgext3rd.badext2 (No module named *badext2*): trying badext2 (glob) YYYY/MM/DD HH:MM:SS (PID)> - could not import hgext3rd.badext2 (No module named *badext2*): trying badext2 (glob)
Traceback (most recent call last): Traceback (most recent call last):
ImportError: No module named badext2 (no-py3 !) ImportError: No module named badext2 (no-py3 !)
ImportError: No module named 'hgext.badext2' (py3 no-py36 !) ImportError: No module named 'hgext.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext.badext2' (py36 !)
Traceback (most recent call last): (py3 !) Traceback (most recent call last): (py3 !)
ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !) ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !)
*** failed to import extension "badext2": No module named 'badext2' *** failed to import extension "badext2": No module named 'badext2' (py3 !)
*** failed to import extension "badext2": No module named badext2 (no-py3 !)
Traceback (most recent call last): Traceback (most recent call last):
ImportError: No module named 'hgext.badext2' (py3 no-py36 !) ImportError: No module named 'hgext.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext.badext2' (py36 !)
Traceback (most recent call last): (py3 !) Traceback (most recent call last): (py3 !)
ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !) ImportError: No module named 'hgext3rd.badext2' (py3 no-py36 !)
ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !) ModuleNotFoundError: No module named 'hgext3rd.badext2' (py36 !)
Traceback (most recent call last): (py3 !) Traceback (most recent call last): (py3 !)
ModuleNotFoundError: No module named 'badext2' (py36 !) ModuleNotFoundError: No module named 'badext2' (py36 !)
YYYY/MM/DD HH:MM:SS (PID)> > extension gpg take a total of * to load (glob) YYYY/MM/DD HH:MM:SS (PID)> > extension gpg take a total of * to load (glob)
YYYY/MM/DD HH:MM:SS (PID)> extension loading complete YYYY/MM/DD HH:MM:SS (PID)> extension loading complete
#endif #endif
confirm that there's no crash when an extension's documentation is bad confirm that there's no crash when an extension's documentation is bad
$ hg help --keyword baddocext $ hg help --keyword baddocext
*** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow *** failed to import extension "badext" from $TESTTMP/badext.py: bit bucket overflow
*** failed to import extension "badext2": No module named 'badext2' *** failed to import extension "badext2": No module named 'badext2' (py3 !)
*** failed to import extension "badext2": No module named badext2 (no-py3 !)
Topics: Topics:
extensions Using Additional Features extensions Using Additional Features

tests/test-extension.t

> except ImportError: > except ImportError:
> pass # intentional failure > pass # intentional failure
> NO_CHECK_EOF > NO_CHECK_EOF
Python 3's lazy importer verifies modules exist before returning the lazy Python 3's lazy importer verifies modules exist before returning the lazy
module stub. Our custom lazy importer for Python 2 always returns a stub. module stub. Our custom lazy importer for Python 2 always returns a stub.
$ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity) || true $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.checkrelativity=$TESTTMP/checkrelativity.py checkrelativity) || true
*** failed to import extension "checkrelativity" from $TESTTMP/checkrelativity.py: No module named 'extlibroot.lsub1.lsub2.notexist' *** failed to import extension "checkrelativity" from $TESTTMP/checkrelativity.py: No module named 'extlibroot.lsub1.lsub2.notexist' (py3 !)
hg: unknown command 'checkrelativity' (py3 !) hg: unknown command 'checkrelativity' (py3 !)
(use 'hg help' for a list of commands) (py3 !) (use 'hg help' for a list of commands) (py3 !)
#endif #endif
(Here, module importing tests are finished. Therefore, use other than (Here, module importing tests are finished. Therefore, use other than
NO_CHECK_* limit mark for heredoc python files, in order to apply NO_CHECK_* limit mark for heredoc python files, in order to apply
import-checker.py or so on their contents) import-checker.py or so on their contents)
> print(opts[b'opt'], flush=True) > print(opts[b'opt'], flush=True)
> EOF > EOF
$ "$PYTHON" $TESTTMP/unflush.py $TESTTMP/test_unicode_default_value.py $ "$PYTHON" $TESTTMP/unflush.py $TESTTMP/test_unicode_default_value.py
$ cat > $TESTTMP/opt-unicode-default/.hg/hgrc << EOF $ cat > $TESTTMP/opt-unicode-default/.hg/hgrc << EOF
> [extensions] > [extensions]
> test_unicode_default_value = $TESTTMP/test_unicode_default_value.py > test_unicode_default_value = $TESTTMP/test_unicode_default_value.py
> EOF > EOF
$ hg -R $TESTTMP/opt-unicode-default dummy $ hg -R $TESTTMP/opt-unicode-default dummy
*** failed to import extension "test_unicode_default_value" from $TESTTMP/test_unicode_default_value.py: unicode 'value' found in cmdtable.dummy *** failed to import extension "test_unicode_default_value" from $TESTTMP/test_unicode_default_value.py: unicode 'value' found in cmdtable.dummy (py3 !)
*** failed to import extension "test_unicode_default_value" from $TESTTMP/test_unicode_default_value.py: unicode u'value' found in cmdtable.dummy (no-py3 !)
*** (use b'' to make it byte string) *** (use b'' to make it byte string)
hg: unknown command 'dummy' hg: unknown command 'dummy'
(did you mean summary?) (did you mean summary?)
[10] [10]
Check the mandatory extension feature Check the mandatory extension feature
------------------------------------- -------------------------------------