Mercurial > hg
annotate tests/test-check-py3-compat.t @ 31971:73e9328e5307
obsolescence: add test case D-3 for obsolescence markers exchange
About 3 years ago, in August 2014, the logic to select what markers to select on
push was ported from the evolve extension to Mercurial core. However, for some
unclear reasons, the tests for that logic were not ported alongside.
I realised it a couple of weeks ago while working on another push related issue.
I've made a clean up pass on the tests and they are now ready to integrate the
core test suite. This series of changesets do not change any logic. I just adds
test for logic that has been around for about 10 versions of Mercurial.
They are a patch for each test case. It makes it easier to review and postpone
one with documentation issues without rejecting the wholes series.
This patch introduce case D3: missing prune target (prune not in "pushed set")
Each test case comes it in own test file. It help parallelism and does not
introduce a significant overhead from having a single unified giant test file.
Here are timing to support this claim.
# Multiple test files version:
# run-tests.py --local -j 1 test-exchange-*.t
53.40s user 6.82s system 85% cpu 1:10.76 total
52.79s user 6.97s system 85% cpu 1:09.97 total
52.94s user 6.82s system 85% cpu 1:09.69 total
# Single test file version:
# run-tests.py --local -j 1 test-exchange-obsmarkers.t
52.97s user 6.85s system 85% cpu 1:10.10 total
52.64s user 6.79s system 85% cpu 1:09.63 total
53.70s user 7.00s system 85% cpu 1:11.17 total
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Mon, 10 Apr 2017 16:54:43 +0200 |
parents | 1064a296a2a7 |
children | 9ed70525fd6e |
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 |
27438
f121cf57ca9a
tests: convert directory separators to '/' for MSYS in test-check-py-compat
Matt Harbison <matt_harbison@yahoo.com>
parents:
27361
diff
changeset
|
6 $ hg files 'set:(**.py)' | 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
|
7 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
|
8 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
|
9 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
|
10 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
|
11 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
|
12 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
|
13 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
|
14 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
|
15 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
|
16 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
|
17 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
|
18 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
|
19 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
|
20 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
|
21 setup.py not using absolute_import |
40eb385f798f
tests: add test for Python 3 compatibility
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
22 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
|
23 |
260ce2eed951
tests: perform an ast parse with Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28564
diff
changeset
|
24 #if py3exe |
30673
81bf1a686b99
py3: exclude pywatchman from test-check-py3-compat.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30672
diff
changeset
|
25 $ hg files 'set:(**.py) - grep(pygments)' -X hgext/fsmonitor/pywatchman \ |
81bf1a686b99
py3: exclude pywatchman from test-check-py3-compat.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
30672
diff
changeset
|
26 > | 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
|
27 > | 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
|
28 hgext/convert/transport.py: error importing: <*Error> No module named 'svn.client' (error at transport.py:*) (glob) |
31846
1064a296a2a7
fsmonitor: match watchman and filesystem encoding
Olivier Trempe <oliviertrempe@gmail.com>
parents:
31796
diff
changeset
|
29 hgext/fsmonitor/state.py: error importing: <SyntaxError> from __future__ imports must occur at the beginning of the file (__init__.py, line 30) (error at __init__.py:*) |
1064a296a2a7
fsmonitor: match watchman and filesystem encoding
Olivier Trempe <oliviertrempe@gmail.com>
parents:
31796
diff
changeset
|
30 hgext/fsmonitor/watchmanclient.py: error importing: <SyntaxError> from __future__ imports must occur at the beginning of the file (__init__.py, line 30) (error at __init__.py:*) |
31480
07fe520280d2
tests: allow ModuleNotFoundError in addition to ImportError
Martin von Zweigbergk <martinvonz@google.com>
parents:
30895
diff
changeset
|
31 mercurial/cffi/bdiff.py: error importing: <*Error> No module named 'mercurial.cffi' (error at check-py3-compat.py:*) (glob) |
07fe520280d2
tests: allow ModuleNotFoundError in addition to ImportError
Martin von Zweigbergk <martinvonz@google.com>
parents:
30895
diff
changeset
|
32 mercurial/cffi/mpatch.py: error importing: <*Error> No module named 'mercurial.cffi' (error at check-py3-compat.py:*) (glob) |
07fe520280d2
tests: allow ModuleNotFoundError in addition to ImportError
Martin von Zweigbergk <martinvonz@google.com>
parents:
30895
diff
changeset
|
33 mercurial/cffi/osutil.py: error importing: <*Error> No module named 'mercurial.cffi' (error at check-py3-compat.py:*) (glob) |
07fe520280d2
tests: allow ModuleNotFoundError in addition to ImportError
Martin von Zweigbergk <martinvonz@google.com>
parents:
30895
diff
changeset
|
34 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
|
35 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
|
36 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
|
37 |
260ce2eed951
tests: perform an ast parse with Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28564
diff
changeset
|
38 #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
|
39 |
e2c086f147ef
py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents:
29810
diff
changeset
|
40 #if py3exe py3pygments |
e2c086f147ef
py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents:
29810
diff
changeset
|
41 $ hg files 'set:(**.py) and grep(pygments)' | sed 's|\\|/|g' \ |
e2c086f147ef
py3: split check of pygments-using files from the rest of the tree
Augie Fackler <augie@google.com>
parents:
29810
diff
changeset
|
42 > | 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
|
43 > | 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
|
44 #endif |