Mercurial > hg
annotate tests/test-check-module-imports.t @ 38757:d49e490a9e85 stable
merge: do the trivial resolution after updating sparse checkout
In merge, we do trivial resolution for files which were deleted on one side and
changed on other. When sparse extension in involved that file might not be
present in wdir and trivial resolution can lead to file not found error. This
patch make sure we updates the sparse checkout before doing the trivial
resolution.
This fixes the test failure demonstrated in previous patch.
Differential Revision: https://phab.mercurial-scm.org/D3984
author | Pulkit Goyal <pulkit@yandex-team.ru> |
---|---|
date | Fri, 27 Jul 2018 14:56:10 +0300 |
parents | e5916f1236f3 |
children | 5abc47d4ca6b |
rev | line source |
---|---|
23894
f388ceae2250
test-module-imports: use test-repo requirement
Matt Mackall <mpm@selenic.com>
parents:
22947
diff
changeset
|
1 #require test-repo |
f388ceae2250
test-module-imports: use test-repo requirement
Matt Mackall <mpm@selenic.com>
parents:
22947
diff
changeset
|
2 |
29219
3c9066ed557c
tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents:
29212
diff
changeset
|
3 $ . "$TESTDIR/helpers-testrepo.sh" |
20039
05626e87489c
test-module-imports.t: new test to use the import cycle detector
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
4 $ import_checker="$TESTDIR"/../contrib/import-checker.py |
23894
f388ceae2250
test-module-imports: use test-repo requirement
Matt Mackall <mpm@selenic.com>
parents:
22947
diff
changeset
|
5 |
20039
05626e87489c
test-module-imports.t: new test to use the import cycle detector
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
6 $ cd "$TESTDIR"/.. |
05626e87489c
test-module-imports.t: new test to use the import cycle detector
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
7 |
05626e87489c
test-module-imports.t: new test to use the import cycle detector
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
8 There are a handful of cases here that require renaming a module so it |
05626e87489c
test-module-imports.t: new test to use the import cycle detector
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
9 doesn't overlap with a stdlib module name. There are also some cycles |
05626e87489c
test-module-imports.t: new test to use the import cycle detector
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
10 here that we should still endeavor to fix, and some cycles will be |
05626e87489c
test-module-imports.t: new test to use the import cycle detector
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
11 hidden by deduplication algorithm in the cycle detector, so fixing |
05626e87489c
test-module-imports.t: new test to use the import cycle detector
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
12 these may expose other cycles. |
05626e87489c
test-module-imports.t: new test to use the import cycle detector
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
13 |
28844
99a2bdad0fda
tests: enable import checker for tests/**.py files
Yuya Nishihara <yuya@tcha.org>
parents:
28330
diff
changeset
|
14 Known-bad files are excluded by -X as some of them would produce unstable |
99a2bdad0fda
tests: enable import checker for tests/**.py files
Yuya Nishihara <yuya@tcha.org>
parents:
28330
diff
changeset
|
15 outputs, which should be fixed later. |
99a2bdad0fda
tests: enable import checker for tests/**.py files
Yuya Nishihara <yuya@tcha.org>
parents:
28330
diff
changeset
|
16 |
33204
ddd65b4f3ae6
tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents:
33116
diff
changeset
|
17 $ testrepohg locate 'set:**.py or grep(r"^#!.*?python")' \ |
28923
531dea16f4f7
tests: run import-checker with tests .t files
timeless <timeless@mozdev.org>
parents:
28844
diff
changeset
|
18 > 'tests/**.t' \ |
33914
a0aeb096bb12
tests: blacklist some more entries in module import checks
Augie Fackler <raf@durin42.com>
parents:
33439
diff
changeset
|
19 > -X hgweb.cgi \ |
a0aeb096bb12
tests: blacklist some more entries in module import checks
Augie Fackler <raf@durin42.com>
parents:
33439
diff
changeset
|
20 > -X setup.py \ |
29212
8005e0e0eb33
tests: enable import checker for all **.py files
Yuya Nishihara <yuya@tcha.org>
parents:
29208
diff
changeset
|
21 > -X contrib/debugshell.py \ |
33914
a0aeb096bb12
tests: blacklist some more entries in module import checks
Augie Fackler <raf@durin42.com>
parents:
33439
diff
changeset
|
22 > -X contrib/hgweb.fcgi \ |
38458
e5916f1236f3
packaging: replace dockerlib.sh with a Python script
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37810
diff
changeset
|
23 > -X contrib/packaging/hg-docker \ |
30435
b86a448a2965
zstd: vendor python-zstandard 0.5.0
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29305
diff
changeset
|
24 > -X contrib/python-zstandard/ \ |
29212
8005e0e0eb33
tests: enable import checker for all **.py files
Yuya Nishihara <yuya@tcha.org>
parents:
29208
diff
changeset
|
25 > -X contrib/win32/hgwebdir_wsgi.py \ |
8005e0e0eb33
tests: enable import checker for all **.py files
Yuya Nishihara <yuya@tcha.org>
parents:
29208
diff
changeset
|
26 > -X doc/gendoc.py \ |
8005e0e0eb33
tests: enable import checker for all **.py files
Yuya Nishihara <yuya@tcha.org>
parents:
29208
diff
changeset
|
27 > -X doc/hgmanpage.py \ |
29234
393aef802535
tests: enable import checker for all python files (including no .py files)
Yuya Nishihara <yuya@tcha.org>
parents:
29219
diff
changeset
|
28 > -X i18n/posplit \ |
34395
41401f502c83
tests: disable lints on mercurial/thirdparty
Siddharth Agarwal <sid0@fb.com>
parents:
33917
diff
changeset
|
29 > -X mercurial/thirdparty \ |
28844
99a2bdad0fda
tests: enable import checker for tests/**.py files
Yuya Nishihara <yuya@tcha.org>
parents:
28330
diff
changeset
|
30 > -X tests/hypothesishelpers.py \ |
37810
856f381ad74b
interfaceutil: module to stub out zope.interface
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34395
diff
changeset
|
31 > -X tests/test-check-interfaces.py \ |
28923
531dea16f4f7
tests: run import-checker with tests .t files
timeless <timeless@mozdev.org>
parents:
28844
diff
changeset
|
32 > -X tests/test-commit-interactive.t \ |
531dea16f4f7
tests: run import-checker with tests .t files
timeless <timeless@mozdev.org>
parents:
28844
diff
changeset
|
33 > -X tests/test-contrib-check-code.t \ |
33917
9ce139c9222f
tests: blacklist test-demandimport from test-check-module-imports
Augie Fackler <raf@durin42.com>
parents:
33916
diff
changeset
|
34 > -X tests/test-demandimport.py \ |
28923
531dea16f4f7
tests: run import-checker with tests .t files
timeless <timeless@mozdev.org>
parents:
28844
diff
changeset
|
35 > -X tests/test-extension.t \ |
531dea16f4f7
tests: run import-checker with tests .t files
timeless <timeless@mozdev.org>
parents:
28844
diff
changeset
|
36 > -X tests/test-hghave.t \ |
33916
d669b1ad215f
tests: sort excluded test files in test-check-module-imports
Augie Fackler <raf@durin42.com>
parents:
33914
diff
changeset
|
37 > -X tests/test-hgweb-auth.py \ |
28923
531dea16f4f7
tests: run import-checker with tests .t files
timeless <timeless@mozdev.org>
parents:
28844
diff
changeset
|
38 > -X tests/test-hgweb-no-path-info.t \ |
531dea16f4f7
tests: run import-checker with tests .t files
timeless <timeless@mozdev.org>
parents:
28844
diff
changeset
|
39 > -X tests/test-hgweb-no-request-uri.t \ |
531dea16f4f7
tests: run import-checker with tests .t files
timeless <timeless@mozdev.org>
parents:
28844
diff
changeset
|
40 > -X tests/test-hgweb-non-interactive.t \ |
33916
d669b1ad215f
tests: sort excluded test files in test-check-module-imports
Augie Fackler <raf@durin42.com>
parents:
33914
diff
changeset
|
41 > -X tests/test-hook.t \ |
d669b1ad215f
tests: sort excluded test files in test-check-module-imports
Augie Fackler <raf@durin42.com>
parents:
33914
diff
changeset
|
42 > -X tests/test-import.t \ |
d669b1ad215f
tests: sort excluded test files in test-check-module-imports
Augie Fackler <raf@durin42.com>
parents:
33914
diff
changeset
|
43 > -X tests/test-imports-checker.t \ |
d669b1ad215f
tests: sort excluded test files in test-check-module-imports
Augie Fackler <raf@durin42.com>
parents:
33914
diff
changeset
|
44 > -X tests/test-lock.py \ |
d669b1ad215f
tests: sort excluded test files in test-check-module-imports
Augie Fackler <raf@durin42.com>
parents:
33914
diff
changeset
|
45 > -X tests/test-verify-repo-operations.py \ |
33262
8e6f4939a69a
tests: replace yet more calls to `python` with $PYTHON
Augie Fackler <augie@google.com>
parents:
33204
diff
changeset
|
46 > | sed 's-\\-/-g' | $PYTHON "$import_checker" - |