Patchwork [3,of,5] tests: use NO_CHECK_EOF for fragments having intentional error

login
register
mail settings
Submitter Katsunori FUJIWARA
Date Oct. 12, 2018, 7:48 a.m.
Message ID <09b2a0aefdbb99291869.1539330525@blacknile>
Download mbox | patch
Permalink /patch/35650/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - Oct. 12, 2018, 7:48 a.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1538962259 -32400
#      Mon Oct 08 10:30:59 2018 +0900
# Node ID 09b2a0aefdbb992918696f6d3685e8276c038c07
# Parent  06db0c68e10d53381714f5f4224f00cf4d07a4d0
# Available At https://bitbucket.org/foozy/mercurial-wip
#              hg pull https://bitbucket.org/foozy/mercurial-wip -r 09b2a0aefdbb
# EXP-Topic tests-fix-import-issues
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.

Patch

diff --git a/tests/test-commit-interactive.t b/tests/test-commit-interactive.t
--- a/tests/test-commit-interactive.t
+++ b/tests/test-commit-interactive.t
@@ -338,7 +338,7 @@  Modify end of plain file, no EOL
 
 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 @@  Record showfunc should preserve function
   >     .. 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 @@  Record showfunc should preserve function
   >     .. container:: verbose
   > 
   >     Valid types are:
-  > EOF
+  > NO_CHECK_EOF
   $ hg commit -i -m interactive <<EOF
   > y
   > y
diff --git a/tests/test-extension.t b/tests/test-extension.t
--- a/tests/test-extension.t
+++ b/tests/test-extension.t
@@ -1232,9 +1232,9 @@  Broken disabled extension and command:
 
   $ 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'])
diff --git a/tests/test-hghave.t b/tests/test-hghave.t
--- a/tests/test-hghave.t
+++ b/tests/test-hghave.t
@@ -35,9 +35,9 @@  Testing hghave extensibility for third p
 (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)
diff --git a/tests/test-hook.t b/tests/test-hook.t
--- a/tests/test-hook.t
+++ b/tests/test-hook.t
@@ -456,9 +456,9 @@  preoutgoing hook can prevent outgoing ch
   >     unreachable = 1
   > EOF
 
-  $ cat > syntaxerror.py << EOF
+  $ cat > syntaxerror.py << NO_CHECK_EOF
   > (foo
-  > EOF
+  > NO_CHECK_EOF
 
 test python hooks