Mercurial > hg
annotate tests/test-check-py3-compat.t @ 33611:a2b55ee62803 stable
tests: make pdiff return appropriate exit code at comparison of files
Before this patch, pdiff script returns 0, even if diff is detected.
This issue doesn't cause failure of tests using it, if it is invoked
via extdiff extension, because extdiff itself examines changes between
specified revisions and decides exit code.
BTW, this patch ignores recursive comparison case, because:
- there is no portable way for current while-read based
implementation to return 1 at detecting changes
- it isn't yet needed to replace direct "diff -r" invocation by
pdiff for portability
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Mon, 31 Jul 2017 13:10:19 +0900 |
parents | 05e3fa254b6b |
children | 078099304772 |
rev | line source |
---|---|
27279
40eb385f798f
tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
1 #require test-repo |
40eb385f798f
tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
2 |
29219
3c9066ed557c
tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents:
29195
diff
changeset
|
3 $ . "$TESTDIR/helpers-testrepo.sh" |
27279
40eb385f798f
tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
4 $ cd "$TESTDIR"/.. |
40eb385f798f
tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
5 |
33530
05e3fa254b6b
demandimport: drop Py3 workarounds from Py2 implementation
Yuya Nishihara <yuya@tcha.org>
parents:
33204
diff
changeset
|
6 $ testrepohg files 'set:(**.py)' \ |
05e3fa254b6b
demandimport: drop Py3 workarounds from Py2 implementation
Yuya Nishihara <yuya@tcha.org>
parents:
33204
diff
changeset
|
7 > -X hgdemandimport/demandimportpy2.py \ |
05e3fa254b6b
demandimport: drop Py3 workarounds from Py2 implementation
Yuya Nishihara <yuya@tcha.org>
parents:
33204
diff
changeset
|
8 > | sed 's|\\|/|g' | xargs $PYTHON contrib/check-py3-compat.py |
30435
b86a448a2965
zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30333
diff
changeset
|
9 contrib/python-zstandard/setup.py not using absolute_import |
b86a448a2965
zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30333
diff
changeset
|
10 contrib/python-zstandard/setup_zstd.py not using absolute_import |
b86a448a2965
zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30333
diff
changeset
|
11 contrib/python-zstandard/tests/common.py not using absolute_import |
31796
e0dc40530c5a
zstd: vendor python-zstandard 0.8.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31480
diff
changeset
|
12 contrib/python-zstandard/tests/test_buffer_util.py not using absolute_import |
30435
b86a448a2965
zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30333
diff
changeset
|
13 contrib/python-zstandard/tests/test_compressor.py not using absolute_import |
31796
e0dc40530c5a
zstd: vendor python-zstandard 0.8.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31480
diff
changeset
|
14 contrib/python-zstandard/tests/test_compressor_fuzzing.py not using absolute_import |
30435
b86a448a2965
zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30333
diff
changeset
|
15 contrib/python-zstandard/tests/test_data_structures.py not using absolute_import |
31796
e0dc40530c5a
zstd: vendor python-zstandard 0.8.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31480
diff
changeset
|
16 contrib/python-zstandard/tests/test_data_structures_fuzzing.py not using absolute_import |
30435
b86a448a2965
zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30333
diff
changeset
|
17 contrib/python-zstandard/tests/test_decompressor.py not using absolute_import |
31796
e0dc40530c5a
zstd: vendor python-zstandard 0.8.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31480
diff
changeset
|
18 contrib/python-zstandard/tests/test_decompressor_fuzzing.py not using absolute_import |
30435
b86a448a2965
zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30333
diff
changeset
|
19 contrib/python-zstandard/tests/test_estimate_sizes.py not using absolute_import |
b86a448a2965
zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30333
diff
changeset
|
20 contrib/python-zstandard/tests/test_module_attributes.py not using absolute_import |
b86a448a2965
zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
30333
diff
changeset
|
21 contrib/python-zstandard/tests/test_train_dictionary.py not using absolute_import |
27279
40eb385f798f
tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
22 i18n/check-translation.py not using absolute_import |
40eb385f798f
tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
23 setup.py not using absolute_import |
40eb385f798f
tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
24 tests/test-demandimport.py not using absolute_import |
28583
260ce2eed951
tests: perform an ast parse with Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28564
diff
changeset
|
25 |
260ce2eed951
tests: perform an ast parse with Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28564
diff
changeset
|
26 #if py3exe |
33204
ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents:
33116
diff
changeset
|
27 $ testrepohg files 'set:(**.py) - grep(pygments)' \ |
33530
05e3fa254b6b
demandimport: drop Py3 workarounds from Py2 implementation
Yuya Nishihara <yuya@tcha.org>
parents:
33204
diff
changeset
|
28 > -X hgdemandimport/demandimportpy2.py \ |
33204
ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents:
33116
diff
changeset
|
29 > -X hgext/fsmonitor/pywatchman \ |
30673
81bf1a686b99
py3: exclude pywatchman from test-check-py3-compat.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30672
diff
changeset
|
30 > | sed 's|\\|/|g' | xargs $PYTHON3 contrib/check-py3-compat.py \ |
29810
ceff91dea404
py3: automatically glob out line numbers from check-py3-compat output
Yuya Nishihara <yuya@tcha.org>
parents:
29809
diff
changeset
|
31 > | sed 's/[0-9][0-9]*)$/*)/' |
31480
07fe520280d2
tests: allow ModuleNotFoundError in addition to ImportError
Martin von Zweigbergk <martinvonz@google.com>
parents:
30895
diff
changeset
|
32 hgext/convert/transport.py: error importing: <*Error> No module named 'svn.client' (error at transport.py:*) (glob) |
32522
9ed70525fd6e
py3: update test-check-py3-compat.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31846
diff
changeset
|
33 mercurial/cffi/bdiff.py: error importing: <ImportError> cannot import name '_bdiff' (error at bdiff.py:*) |
9ed70525fd6e
py3: update test-check-py3-compat.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31846
diff
changeset
|
34 mercurial/cffi/bdiffbuild.py: error importing: <ImportError> No module named 'cffi' (error at bdiffbuild.py:*) |
9ed70525fd6e
py3: update test-check-py3-compat.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31846
diff
changeset
|
35 mercurial/cffi/mpatch.py: error importing: <ImportError> cannot import name '_mpatch' (error at mpatch.py:*) |
9ed70525fd6e
py3: update test-check-py3-compat.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31846
diff
changeset
|
36 mercurial/cffi/mpatchbuild.py: error importing: <ImportError> No module named 'cffi' (error at mpatchbuild.py:*) |
9ed70525fd6e
py3: update test-check-py3-compat.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
31846
diff
changeset
|
37 mercurial/cffi/osutilbuild.py: error importing: <ImportError> No module named 'cffi' (error at osutilbuild.py:*) |
31480
07fe520280d2
tests: allow ModuleNotFoundError in addition to ImportError
Martin von Zweigbergk <martinvonz@google.com>
parents:
30895
diff
changeset
|
38 mercurial/scmwindows.py: error importing: <*Error> No module named 'msvcrt' (error at win32.py:*) (glob) |
07fe520280d2
tests: allow ModuleNotFoundError in addition to ImportError
Martin von Zweigbergk <martinvonz@google.com>
parents:
30895
diff
changeset
|
39 mercurial/win32.py: error importing: <*Error> No module named 'msvcrt' (error at win32.py:*) (glob) |
07fe520280d2
tests: allow ModuleNotFoundError in addition to ImportError
Martin von Zweigbergk <martinvonz@google.com>
parents:
30895
diff
changeset
|
40 mercurial/windows.py: error importing: <*Error> No module named 'msvcrt' (error at windows.py:*) (glob) |
28583
260ce2eed951
tests: perform an ast parse with Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28564
diff
changeset
|
41 |
260ce2eed951
tests: perform an ast parse with Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28564
diff
changeset
|
42 #endif |
29886
e2c086f147ef
py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents:
29810
diff
changeset
|
43 |
e2c086f147ef
py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents:
29810
diff
changeset
|
44 #if py3exe py3pygments |
33204
ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents:
33116
diff
changeset
|
45 $ testrepohg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \ |
29886
e2c086f147ef
py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents:
29810
diff
changeset
|
46 > | xargs $PYTHON3 contrib/check-py3-compat.py \ |
e2c086f147ef
py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents:
29810
diff
changeset
|
47 > | sed 's/[0-9][0-9]*)$/*)/' |
e2c086f147ef
py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents:
29810
diff
changeset
|
48 #endif |