This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12257

tests: delete some no-py3 blocks
ClosedPublic

Authored by indygreg on Mar 1 2022, 7:36 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0583d7f0fdff: tests: delete some no-py3 blocks
Summary

And drop some nearby avoidable py3 checks in close proximity while
we are here.

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.Mar 1 2022, 7:36 PM
Alphare accepted this revision.Mar 2 2022, 6:02 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
tests/test-subrepo-git.t
9

How wise we were

This revision is now accepted and ready to land.Mar 2 2022, 6:02 AM
indygreg added a commit: rHG0583d7f0fdff: tests: delete some no-py3 blocks.Mar 3 2022, 11:48 AM
Closed by commit rHG0583d7f0fdff: tests: delete some no-py3 blocks (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 32494

tests/test-archive.t

test xz support only available in Python 3.4 test xz support only available in Python 3.4
#if lzma #if lzma
$ hg archive ../archive.txz $ hg archive ../archive.txz
$ which xz >/dev/null && xz -l ../archive.txz | head -n1 || true $ which xz >/dev/null && xz -l ../archive.txz | head -n1 || true
Strms Blocks Compressed Uncompressed Ratio Check Filename (xz !) Strms Blocks Compressed Uncompressed Ratio Check Filename (xz !)
$ rm -f ../archive.txz $ rm -f ../archive.txz
#endif #endif
#if py3 no-lzma #if no-lzma
$ hg archive ../archive.txz $ hg archive ../archive.txz
abort: lzma module is not available abort: lzma module is not available
[255] [255]
#endif #endif
#if no-py3
$ hg archive ../archive.txz
abort: xz compression is only available in Python 3
[255]
#endif
show an error when a provided pattern matches no files show an error when a provided pattern matches no files
$ hg archive -I file_that_does_not_exist.foo ../empty.zip $ hg archive -I file_that_does_not_exist.foo ../empty.zip
abort: no files match the archive pattern abort: no files match the archive pattern
[255] [255]
$ hg archive -X * ../empty.zip $ hg archive -X * ../empty.zip

tests/test-check-py3-compat.t

#require test-repo pure #require test-repo pure
$ . "$TESTDIR/helpers-testrepo.sh" $ . "$TESTDIR/helpers-testrepo.sh"
$ cd "$TESTDIR"/.. $ cd "$TESTDIR"/..
#if no-py3
$ testrepohg files 'set:(**.py)' \
> -X contrib/automation/ \
> -X contrib/packaging/hgpackaging/ \
> -X contrib/packaging/inno/ \
> -X contrib/packaging/packaging.py \
> -X contrib/packaging/wix/ \
> -X hgdemandimport/demandimportpy2.py \
> -X mercurial/thirdparty/cbor \
> | sed 's|\\|/|g' | xargs "$PYTHON" contrib/check-py3-compat.py
contrib/python-zstandard/setup.py not using absolute_import
contrib/python-zstandard/setup_zstd.py not using absolute_import
contrib/python-zstandard/tests/common.py not using absolute_import
contrib/python-zstandard/tests/test_buffer_util.py not using absolute_import
contrib/python-zstandard/tests/test_compressor.py not using absolute_import
contrib/python-zstandard/tests/test_compressor_fuzzing.py not using absolute_import
contrib/python-zstandard/tests/test_data_structures.py not using absolute_import
contrib/python-zstandard/tests/test_data_structures_fuzzing.py not using absolute_import
contrib/python-zstandard/tests/test_decompressor.py not using absolute_import
contrib/python-zstandard/tests/test_decompressor_fuzzing.py not using absolute_import
contrib/python-zstandard/tests/test_estimate_sizes.py not using absolute_import
contrib/python-zstandard/tests/test_module_attributes.py not using absolute_import
contrib/python-zstandard/tests/test_train_dictionary.py not using absolute_import
setup.py not using absolute_import
#endif
#if py3
$ testrepohg files 'set:(**.py) - grep(pygments)' \ $ testrepohg files 'set:(**.py) - grep(pygments)' \
> -X hgdemandimport/demandimportpy2.py \ > -X hgdemandimport/demandimportpy2.py \
> -X hgext/fsmonitor/pywatchman \ > -X hgext/fsmonitor/pywatchman \
> -X mercurial/cffi \ > -X mercurial/cffi \
> -X mercurial/thirdparty \ > -X mercurial/thirdparty \
> | sed 's|\\|/|g' | xargs "$PYTHON" contrib/check-py3-compat.py \ > | sed 's|\\|/|g' | xargs "$PYTHON" contrib/check-py3-compat.py \
> | sed 's/[0-9][0-9]*)$/*)/' > | sed 's/[0-9][0-9]*)$/*)/'
hgext/convert/transport.py: error importing: <*Error> No module named 'svn.client' (error at transport.py:*) (glob) (?) hgext/convert/transport.py: error importing: <*Error> No module named 'svn.client' (error at transport.py:*) (glob) (?)
hgext/infinitepush/sqlindexapi.py: error importing: <*Error> No module named 'mysql' (error at sqlindexapi.py:*) (glob) (?) hgext/infinitepush/sqlindexapi.py: error importing: <*Error> No module named 'mysql' (error at sqlindexapi.py:*) (glob) (?)
mercurial/scmwindows.py: error importing: <ValueError> _type_ 'v' not supported (error at win32.py:*) (no-windows !) mercurial/scmwindows.py: error importing: <ValueError> _type_ 'v' not supported (error at win32.py:*) (no-windows !)
mercurial/win32.py: error importing: <ValueError> _type_ 'v' not supported (error at win32.py:*) (no-windows !) mercurial/win32.py: error importing: <ValueError> _type_ 'v' not supported (error at win32.py:*) (no-windows !)
mercurial/windows.py: error importing: <*Error> No module named 'msvcrt' (error at windows.py:*) (glob) (no-windows !) mercurial/windows.py: error importing: <*Error> No module named 'msvcrt' (error at windows.py:*) (glob) (no-windows !)
mercurial/posix.py: error importing: <*Error> No module named 'fcntl' (error at posix.py:*) (glob) (windows !) mercurial/posix.py: error importing: <*Error> No module named 'fcntl' (error at posix.py:*) (glob) (windows !)
mercurial/scmposix.py: error importing: <*Error> No module named 'fcntl' (error at scmposix.py:*) (glob) (windows !) mercurial/scmposix.py: error importing: <*Error> No module named 'fcntl' (error at scmposix.py:*) (glob) (windows !)
#endif
#if py3 pygments #if pygments
$ testrepohg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \ $ testrepohg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \
> | xargs "$PYTHON" contrib/check-py3-compat.py \ > | xargs "$PYTHON" contrib/check-py3-compat.py \
> | sed 's/[0-9][0-9]*)$/*)/' > | sed 's/[0-9][0-9]*)$/*)/'
#endif #endif

tests/test-extension.t

> def extsetup(ui): > def extsetup(ui):
> print('ambigabs.s=%s' % ambigabs.s, flush=True) > print('ambigabs.s=%s' % ambigabs.s, flush=True)
> NO_CHECK_EOF > NO_CHECK_EOF
$ "$PYTHON" $TESTTMP/unflush.py loadabs.py $ "$PYTHON" $TESTTMP/unflush.py loadabs.py
$ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadabs=loadabs.py root) $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadabs=loadabs.py root)
ambigabs.s=libroot/ambig.py ambigabs.s=libroot/ambig.py
$TESTTMP/a $TESTTMP/a
#if no-py3
$ cat > $TESTTMP/libroot/mod/ambigrel.py <<NO_CHECK_EOF
> import ambig # should load "libroot/mod/ambig.py"
> s = ambig.s
> NO_CHECK_EOF
$ cat > loadrel.py <<NO_CHECK_EOF
> import mod.ambigrel as ambigrel
> def extsetup(ui):
> print('ambigrel.s=%s' % ambigrel.s, flush=True)
> NO_CHECK_EOF
$ "$PYTHON" $TESTTMP/unflush.py loadrel.py
$ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadrel=loadrel.py root)
ambigrel.s=libroot/mod/ambig.py
$TESTTMP/a
#endif
Check absolute/relative import of extension specific modules Check absolute/relative import of extension specific modules
$ mkdir $TESTTMP/extroot $ mkdir $TESTTMP/extroot
$ cat > $TESTTMP/extroot/bar.py <<NO_CHECK_EOF $ cat > $TESTTMP/extroot/bar.py <<NO_CHECK_EOF
> s = b'this is extroot.bar' > s = b'this is extroot.bar'
> NO_CHECK_EOF > NO_CHECK_EOF
$ mkdir $TESTTMP/extroot/sub1 $ mkdir $TESTTMP/extroot/sub1
$ cat > $TESTTMP/extroot/sub1/__init__.py <<NO_CHECK_EOF $ cat > $TESTTMP/extroot/sub1/__init__.py <<NO_CHECK_EOF
$ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.extroot=$TESTTMP/extroot root) $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}; hg --config extensions.extroot=$TESTTMP/extroot root)
(extroot) from extroot.bar import *: this is extroot.bar (extroot) from extroot.bar import *: this is extroot.bar
(extroot) import extroot.sub1.baz: this is extroot.sub1.baz (extroot) import extroot.sub1.baz: this is extroot.sub1.baz
(extroot) import extroot: this is extroot.__init__ (extroot) import extroot: this is extroot.__init__
(extroot) from extroot.bar import s: this is extroot.bar (extroot) from extroot.bar import s: this is extroot.bar
(extroot) import extroot.bar in func(): this is extroot.bar (extroot) import extroot.bar in func(): this is extroot.bar
$TESTTMP/a $TESTTMP/a
#if no-py3
$ rm "$TESTTMP"/extroot/foo.*
$ rm -Rf "$TESTTMP/extroot/__pycache__"
$ cat > $TESTTMP/extroot/foo.py <<NO_CHECK_EOF
> # test relative import
> buf = []
> def func():
> # "not locals" case
> import bar
> buf.append('import bar in func(): %s' % bar.s)
> return '\n(extroot) '.join(buf)
> # "fromlist == ('*',)" case
> from bar import *
> buf.append('from bar import *: %s' % s)
> # "not fromlist" and "if '.' in name" case
> import sub1.baz
> buf.append('import sub1.baz: %s' % sub1.baz.s)
> # "not fromlist" and NOT "if '.' in name" case
> import sub1
> buf.append('import sub1: %s' % sub1.s)
> # NOT "not fromlist" and NOT "level != -1" case
> from bar import s
> buf.append('from bar import s: %s' % s)
> NO_CHECK_EOF
$ hg --config extensions.extroot=$TESTTMP/extroot root
(extroot) from bar import *: this is extroot.bar
(extroot) import sub1.baz: this is extroot.sub1.baz
(extroot) import sub1: this is extroot.sub1.__init__
(extroot) from bar import s: this is extroot.bar
(extroot) import bar in func(): this is extroot.bar
$TESTTMP/a
#endif
#if demandimport #if demandimport
Examine whether module loading is delayed until actual referring, even Examine whether module loading is delayed until actual referring, even
though module is imported with "absolute_import" feature. though module is imported with "absolute_import" feature.
Files below in each packages are used for described purpose: Files below in each packages are used for described purpose:
- "called": examine whether "from MODULE import ATTR" works correctly - "called": examine whether "from MODULE import ATTR" works correctly

tests/test-subrepo-git.t

#require git #require git
# XXX-CHG When running with python2 + chg this test tend to get stuck and end up
# as a time-out error. My effort to reproduce this outside of the CI failed. The
# test itself seems to pass fine, but never "complete". Debugging it is slow and
# tedious. This as a bad impact on the development process as most CI run end up
# wasting abotu 1h until that one fails.
#
# Pierre-Yves David, Augie Fackler and Raphaël Gomès all agreed to disable this
AlphareUnsubmitted
Not Done

How wise we were

Alphare: How wise we were
# case in that specific case until we figure this out (or we drop python2 o:-) )
#if no-py3 chg
$ echo 'skipped: this test get stuck on the CI with python2 + chg. investigation needed'
$ exit 80
#endif
make git commits repeatable make git commits repeatable
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [defaults] > [defaults]
> commit = -d "0 0" > commit = -d "0 0"
> EOF > EOF
$ echo "[core]" >> $HOME/.gitconfig $ echo "[core]" >> $HOME/.gitconfig