Mercurial > hg
changeset 40205:89ba51c3e4f1
tests: use NO_CHECK_EOF for fragments having intentional error
Some test scripts are excluded in test-check-module-imports.t, because
import-checker.py reports that code fragments embedded in these test
scripts have syntax error. But these syntax error is intentional.
This patch uses NO_CHECK_EOF instead of EOF as heredoc limit mark for
such fragments, in order to make import-checker.py ignore
them. NO_CHECK_EOF limit mark tells import-checker.py that this code
fragment should be ignored, via testparseutil.py.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Mon, 08 Oct 2018 10:30:59 +0900 |
| parents | 5d50c9ffaebb |
| children | 37295cee1a15 |
| files | tests/test-commit-interactive.t tests/test-extension.t tests/test-hghave.t tests/test-hook.t |
| diffstat | 4 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-commit-interactive.t Mon Oct 08 10:45:36 2018 +0900 +++ b/tests/test-commit-interactive.t Mon Oct 08 10:30:59 2018 +0900 @@ -338,7 +338,7 @@ Record showfunc should preserve function across sections - $ cat > f1.py <<EOF + $ cat > f1.py <<NO_CHECK_EOF > def annotate(ui, repo, *pats, **opts): > """show changeset information by line for each file > @@ -372,10 +372,10 @@ > .. container:: verbose > > Valid types are: - > EOF + > NO_CHECK_EOF $ hg add f1.py $ hg commit -m funcs - $ cat > f1.py <<EOF + $ cat > f1.py <<NO_CHECK_EOF > def annotate(ui, repo, *pats, **opts): > """show changeset information by line for each file > @@ -405,7 +405,7 @@ > .. container:: verbose > > Valid types are: - > EOF + > NO_CHECK_EOF $ hg commit -i -m interactive <<EOF > y > y
--- a/tests/test-extension.t Mon Oct 08 10:45:36 2018 +0900 +++ b/tests/test-extension.t Mon Oct 08 10:30:59 2018 +0900 @@ -1251,9 +1251,9 @@ $ mkdir hgext $ echo > hgext/__init__.py - $ cat > hgext/broken.py <<EOF + $ cat > hgext/broken.py <<NO_CHECK_EOF > "broken extension' - > EOF + > NO_CHECK_EOF $ cat > path.py <<EOF > import os, sys > sys.path.insert(0, os.environ['HGEXTPATH'])
--- a/tests/test-hghave.t Mon Oct 08 10:45:36 2018 +0900 +++ b/tests/test-hghave.t Mon Oct 08 10:30:59 2018 +0900 @@ -35,9 +35,9 @@ (terminate with exit code 2 at failure of importing hghaveaddon.py) $ rm hghaveaddon.* - $ cat > hghaveaddon.py <<EOF + $ cat > hghaveaddon.py <<NO_CHECK_EOF > importing this file should cause syntax error - > EOF + > NO_CHECK_EOF $ hghave custom failed to import hghaveaddon.py from '.': invalid syntax (hghaveaddon.py, line 1)