Mercurial > evolve
annotate tests/test-check-pyflakes.t @ 5787:32c0b2899fc4
divergence-resolution: [patch 2] fix a messed up test case
Because of logic change in divergence resolution which causes the order change
in picking the resolution parent this test case was messed up.
It was supposed to test that that it hits conflict while relocating the
divergent cset but because of some change in previous patches, relocation went
successful and it hits conflict while merging the two divergent csets.
This patch, by making some changes in files content make sure that we get
conflict during relocation.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 24 Jan 2021 20:09:02 +0530 |
parents | 0e397aeee55b |
children | 136dcb4ad4f8 |
rev | line source |
---|---|
1930 | 1 #require test-repo pyflakes |
2 | |
3 Copied from Mercurial core (60ee2593a270) | |
4 | |
5 $ cd "`dirname "$TESTDIR"`" | |
6 | |
5648
0e397aeee55b
tests: update comment in test-check-pyflakes.t
Anton Shestakov <av6@dwimlabs.net>
parents:
5337
diff
changeset
|
7 run pyflakes on all tracked files ending in .py or with a python shebang |
1930 | 8 |
5336
2895b026ba88
tests: modernize test-check-pyflakes.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4333
diff
changeset
|
9 $ hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' \ |
2895b026ba88
tests: modernize test-check-pyflakes.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4333
diff
changeset
|
10 > -X hgext3rd/evolve/thirdparty \ |
2895b026ba88
tests: modernize test-check-pyflakes.t
Anton Shestakov <av6@dwimlabs.net>
parents:
4333
diff
changeset
|
11 > 2>/dev/null \ |
5337
f354de498737
tests: actually use the correct python version for flake8/pyflakes
Anton Shestakov <av6@dwimlabs.net>
parents:
5336
diff
changeset
|
12 > | xargs -0 "$PYTHON" -m pyflakes 2>/dev/null |