This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9814

hghave: split apart testing for the curses module and `tic` executable
ClosedPublic

Authored by mharbison72 on Jan 18 2021, 1:45 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe5e6282fa66a: hghave: split apart testing for the curses module and `tic` executable
Summary

ef771d329961 skipped the check for the tic executable, because the curses
module alone on Windows is enough to pass the test-*-curses.t tests. However,
test-status-color.t uses this same check and explicitly invoked the
executable, which fails on Windows. From the cursory searching I did, curses on
unix requires tic, which I assume is why they were tied together in the first
place. So this continues to require both to get past the curses guards on non
Windows platforms.

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.

Revision Contents
Changeset List

Diff 25111

tests/hghave.py

@check("test-repo", "running tests from repository") @check("test-repo", "running tests from repository")
def has_test_repo(): def has_test_repo():
t = os.environ["TESTDIR"] t = os.environ["TESTDIR"]
return os.path.isdir(os.path.join(t, "..", ".hg")) return os.path.isdir(os.path.join(t, "..", ".hg"))
@check("tic", "terminfo compiler and curses module") @check("curses", "terminfo compiler and curses module")
def has_tic(): def has_curses():
try: try:
import curses import curses
curses.COLOR_BLUE curses.COLOR_BLUE
# Windows doesn't have a `tic` executable, but the windows_curses # Windows doesn't have a `tic` executable, but the windows_curses
# package is sufficient to run the tests without it. # package is sufficient to run the tests without it.
if os.name == 'nt': if os.name == 'nt':
return True return True
return matchoutput('test -x "`which tic`"', br'') return has_tic()
except (ImportError, AttributeError): except (ImportError, AttributeError):
return False return False
@check("tic", "terminfo compiler")
def has_tic():
return matchoutput('test -x "`which tic`"', br'')
@check("xz", "xz compression utility") @check("xz", "xz compression utility")
def has_xz(): def has_xz():
# When Windows invokes a subprocess in shell mode, it uses `cmd.exe`, which # When Windows invokes a subprocess in shell mode, it uses `cmd.exe`, which
# only knows `where`, not `which`. So invoke MSYS shell explicitly. # only knows `where`, not `which`. So invoke MSYS shell explicitly.
return matchoutput("sh -c 'test -x \"`which xz`\"'", b'') return matchoutput("sh -c 'test -x \"`which xz`\"'", b'')
@check("msys", "Windows with MSYS") @check("msys", "Windows with MSYS")

tests/test-commit-interactive-curses.t

#require tic #require curses
Set up a repo Set up a repo
$ cp $HGRCPATH $HGRCPATH.pretest $ cp $HGRCPATH $HGRCPATH.pretest
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [ui] > [ui]
> interactive = true > interactive = true
> interface = curses > interface = curses

tests/test-revert-interactive-curses.t

#require tic #require curses
Revert interactive tests with the Curses interface Revert interactive tests with the Curses interface
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [ui] > [ui]
> interactive = true > interactive = true
> interface = curses > interface = curses
> [experimental] > [experimental]