This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8343

tests: perform grep manually in test-doctest.py
ClosedPublic

Authored by indygreg on Mar 29 2020, 9:30 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG15aef805619d: tests: perform grep manually in test-doctest.py
Summary

This test has been failing on Windows since 0af56d3ee24c
introduced the hg files invocation. Specifically, Windows seems
to be choking on special characters in the fileset pattern. I
believe at least \n and > were causing issues.

I attempted various incantations to make the Windows command line
parser accept the fileset but couldn't get anything working.
I declared bankruptcy and just reimplemented the grepping code
in Python.

After this change, the test now passes on Windows again.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 29 2020, 9:30 PM
indygreg added a commit: rHG15aef805619d: tests: perform grep manually in test-doctest.py.Apr 1 2020, 3:09 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG15aef805619d: tests: perform grep manually in test-doctest.py (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-doctest.py (16 lines)

Diff 20953

tests/test-doctest.py

'mercurial.keepalive': DONT_RUN, # >>> is an example, not a doctest 'mercurial.keepalive': DONT_RUN, # >>> is an example, not a doctest
'mercurial.posix': DONT_RUN, # run by mercurial.platform 'mercurial.posix': DONT_RUN, # run by mercurial.platform
'mercurial.statprof': DONT_RUN, # >>> is an example, not a doctest 'mercurial.statprof': DONT_RUN, # >>> is an example, not a doctest
'mercurial.util': [{}, {'testtarget': 'platform'}], # run twice! 'mercurial.util': [{}, {'testtarget': 'platform'}], # run twice!
'mercurial.windows': DONT_RUN, # run by mercurial.platform 'mercurial.windows': DONT_RUN, # run by mercurial.platform
'tests.test-url': [{'optionflags': doctest.NORMALIZE_WHITESPACE}], 'tests.test-url': [{'optionflags': doctest.NORMALIZE_WHITESPACE}],
} }
doctest_indicator = '\n\\s*>>> ' fileset = 'set:(**.py)'
fileset = 'set:(**.py and grep("%s"))' % doctest_indicator
cwd = os.path.dirname(os.environ["TESTDIR"])
files = subprocess.check_output( files = subprocess.check_output(
"hg files --print0 '%s'" % fileset, "hg files --print0 \"%s\"" % fileset, shell=True, cwd=cwd,
shell=True,
cwd=os.path.dirname(os.environ['TESTDIR']),
).split(b'\0') ).split(b'\0')
if sys.version_info[0] >= 3:
cwd = os.fsencode(cwd)
mods_tested = set() mods_tested = set()
for f in files: for f in files:
if not f: if not f:
continue continue
with open(os.path.join(cwd, f), "rb") as fh:
if not re.search(br'\n\s*>>>', fh.read()):
continue
if ispy3: if ispy3:
f = f.decode() f = f.decode()
modname = f.replace('.py', '').replace('\\', '.').replace('/', '.') modname = f.replace('.py', '').replace('\\', '.').replace('/', '.')
# Third-party modules aren't our responsibility to test, and the modules in # Third-party modules aren't our responsibility to test, and the modules in
# contrib generally do not have doctests in a good state, plus they're hard # contrib generally do not have doctests in a good state, plus they're hard
# to import if this test is running with py2, so we just skip both for now. # to import if this test is running with py2, so we just skip both for now.