# HG changeset patch # User FUJIWARA Katsunori # Date 1538962259 -32400 # Node ID 89ba51c3e4f1502e94f6b12343dae36cff6c1168 # Parent 5d50c9ffaebb5d7f1d4cb5cfbb052d4d1eb2035f 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. diff -r 5d50c9ffaebb -r 89ba51c3e4f1 tests/test-commit-interactive.t --- 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 < f1.py < 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 < f1.py < 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 < y > y diff -r 5d50c9ffaebb -r 89ba51c3e4f1 tests/test-extension.t --- 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 < hgext/broken.py < "broken extension' - > EOF + > NO_CHECK_EOF $ cat > path.py < import os, sys > sys.path.insert(0, os.environ['HGEXTPATH']) diff -r 5d50c9ffaebb -r 89ba51c3e4f1 tests/test-hghave.t --- 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 < hghaveaddon.py < 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) diff -r 5d50c9ffaebb -r 89ba51c3e4f1 tests/test-hook.t --- a/tests/test-hook.t Mon Oct 08 10:45:36 2018 +0900 +++ b/tests/test-hook.t Mon Oct 08 10:30:59 2018 +0900 @@ -456,9 +456,9 @@ > unreachable = 1 > EOF - $ cat > syntaxerror.py << EOF + $ cat > syntaxerror.py << NO_CHECK_EOF > (foo - > EOF + > NO_CHECK_EOF test python hooks