This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8280

tests: make test-doctest.t module list match reality
ClosedPublic

Authored by spectral on Mar 13 2020, 12:12 AM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG529cb23155bc: tests: make test-doctest.t module list match reality

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

spectral created this revision.Mar 13 2020, 12:12 AM
mharbison72 requested changes to this revision.Mar 13 2020, 1:06 AM
mharbison72 added a subscriber: mharbison72.

It looks like test-run-tests.py and i18n/check-translation.py have a test too. (Not sure if we care about them; I mostly care about Windows.)

It also looks like dispatch.py can be dropped. Presumably mercurial.util being duplicated (once with a testtarget=... and once without) is on purpose, but IDK what that does.

tests/test-doctest.py
67–68

It looks like this needs to be conditionalized, like the Windows module test:

--- c:/Users/Matt/hg/tests/test-doctest.py.out
+++ c:/Users/Matt/hg/tests/test-doctest.py.err
@@ -0,0 +1,8 @@
+Traceback (most recent call last):
+  File "c:\Users\Matt\hg\tests\test-doctest.py", line 69, in <module>
+    testmod('mercurial.posix')
+  File "c:\Users\Matt\hg\tests\test-doctest.py", line 36, in testmod
+    __import__(name)
+  File "c:\Users\Matt\hg\mercurial\posix.py", line 11, in <module>
+    import fcntl
+ImportError: No module named fcntl
This revision now requires changes to proceed.Mar 13 2020, 1:06 AM
spectral updated this revision to Diff 20766.Mar 13 2020, 1:21 AM
marmoute added a subscriber: marmoute.Mar 13 2020, 4:48 AM

Should we try to move to some automatic detection of file with doctest? That would be more reliable.

mharbison72 accepted this revision.Mar 13 2020, 12:54 PM
spectral marked an inline comment as done.Mar 13 2020, 10:32 PM
In D8280#123642, @marmoute wrote:

Should we try to move to some automatic detection of file with doctest? That would be more reliable.

D8294, though it got a bit complicated :)

spectral added a commit: rHG529cb23155bc: tests: make test-doctest.t module list match reality.Mar 16 2020, 11:22 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG529cb23155bc: tests: make test-doctest.t module list match reality (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 20766

tests/test-doctest.py

if ispy3: if ispy3:
checker = py3docchecker() checker = py3docchecker()
runner = doctest.DocTestRunner(checker=checker, optionflags=optionflags) runner = doctest.DocTestRunner(checker=checker, optionflags=optionflags)
for test in finder.find(mod, name): for test in finder.find(mod, name):
runner.run(test) runner.run(test)
runner.summarize() runner.summarize()
testmod('mercurial.changegroup')
testmod('mercurial.changelog') testmod('mercurial.changelog')
testmod('mercurial.cmdutil') testmod('mercurial.cmdutil')
testmod('mercurial.color') testmod('mercurial.color')
testmod('mercurial.config') testmod('mercurial.config')
testmod('mercurial.context')
testmod('mercurial.dagparser', optionflags=doctest.NORMALIZE_WHITESPACE) testmod('mercurial.dagparser', optionflags=doctest.NORMALIZE_WHITESPACE)
testmod('mercurial.dispatch')
testmod('mercurial.encoding') testmod('mercurial.encoding')
testmod('mercurial.fancyopts') testmod('mercurial.fancyopts')
testmod('mercurial.formatter') testmod('mercurial.formatter')
testmod('mercurial.hg') testmod('mercurial.hg')
testmod('mercurial.hgweb.hgwebdir_mod') testmod('mercurial.hgweb.hgwebdir_mod')
testmod('mercurial.match') testmod('mercurial.match')
testmod('mercurial.mdiff') testmod('mercurial.mdiff')
testmod('mercurial.minirst') testmod('mercurial.minirst')
testmod('mercurial.parser')
testmod('mercurial.patch') testmod('mercurial.patch')
testmod('mercurial.pathutil') testmod('mercurial.pathutil')
testmod('mercurial.parser')
testmod('mercurial.pycompat') testmod('mercurial.pycompat')
mharbison72Unsubmitted
Done

It looks like this needs to be conditionalized, like the Windows module test:

--- c:/Users/Matt/hg/tests/test-doctest.py.out
+++ c:/Users/Matt/hg/tests/test-doctest.py.err
@@ -0,0 +1,8 @@
+Traceback (most recent call last):
+  File "c:\Users\Matt\hg\tests\test-doctest.py", line 69, in <module>
+    testmod('mercurial.posix')
+  File "c:\Users\Matt\hg\tests\test-doctest.py", line 36, in testmod
+    __import__(name)
+  File "c:\Users\Matt\hg\mercurial\posix.py", line 11, in <module>
+    import fcntl
+ImportError: No module named fcntl
mharbison72: It looks like this needs to be conditionalized, like the Windows module test: ``` --- c…
testmod('mercurial.revlog')
testmod('mercurial.revlogutils.deltas') testmod('mercurial.revlogutils.deltas')
testmod('mercurial.revset') testmod('mercurial.revset')
testmod('mercurial.revsetlang') testmod('mercurial.revsetlang')
testmod('mercurial.simplemerge')
testmod('mercurial.smartset') testmod('mercurial.smartset')
testmod('mercurial.store') testmod('mercurial.store')
testmod('mercurial.subrepo') testmod('mercurial.subrepo')
testmod('mercurial.templatefilters')
testmod('mercurial.templater') testmod('mercurial.templater')
testmod('mercurial.ui') testmod('mercurial.ui')
testmod('mercurial.url')
testmod('mercurial.util') testmod('mercurial.util')
testmod('mercurial.util', testtarget='platform') testmod('mercurial.util', testtarget='platform') # windows.py or posix.py
testmod('mercurial.utils.dateutil') testmod('mercurial.utils.dateutil')
testmod('mercurial.utils.stringutil') testmod('mercurial.utils.stringutil')
testmod('hgext.convert.convcmd') testmod('hgext.convert.convcmd')
testmod('hgext.convert.cvsps') testmod('hgext.convert.cvsps')
testmod('hgext.convert.filemap') testmod('hgext.convert.filemap')
testmod('hgext.convert.p4') testmod('hgext.convert.p4')
testmod('hgext.convert.subversion') testmod('hgext.convert.subversion')
testmod('hgext.fix') testmod('hgext.fix')
testmod('hgext.mq') testmod('hgext.mq')
# Helper scripts in tests/ that have doctests: # Helper scripts in tests/ that have doctests:
testmod('drawdag') testmod('drawdag')
testmod('test-run-tests')
# Disabled since it requires extra modules that might not be installed.
# testmod('i18n.check-translation')