This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8638

tests: update output in test-chg.t as setprocname missing in pure build
ClosedPublic

Authored by pulkit on Jun 17 2020, 8:32 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG62bdb288c449: tests: add hghave rule 'setprocname' to check if osutil.setprocname and use it
rHGe4d2efb76c94: tests: add hghave rule 'setprocname' to check if osutil.setprocname and use it
Summary

setprocname is not present when we build a pure version. This leads to output
changes in test-chg.t

This should make test suite green on Python 2 pure build with chg.

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

PathPackages
Mtests/hghave.py (11 lines)
Mtests/test-chg.t (8 lines)

Diff 21671

tests/hghave.py

return os.name != 'nt' return os.name != 'nt'
@check("serve", "platform and python can manage 'hg serve -d'") @check("serve", "platform and python can manage 'hg serve -d'")
def has_serve(): def has_serve():
return True return True
@check("setprocname", "whether osutil.setprocname is available or not")
def has_setprocname():
try:
from mercurial.utils import procutil
procutil.setprocname
return True
except AttributeError:
return False
@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("tic", "terminfo compiler and curses module")
def has_tic(): def has_tic():

tests/test-chg.t

check that server events are recorded: check that server events are recorded:
$ ls log $ ls log
server.log server.log
server.log.1 server.log.1
print only the last 10 lines, since we aren't sure how many records are print only the last 10 lines, since we aren't sure how many records are
preserved (since setprocname isn't available on py3, the 10th-most-recent line preserved (since setprocname isn't available on py3 and pure version,
is different when using py3): the 10th-most-recent line is different when using py3):
$ cat log/server.log.1 log/server.log | tail -10 | filterlog $ cat log/server.log.1 log/server.log | tail -10 | filterlog
YYYY/MM/DD HH:MM:SS (PID)> confighash = ... mtimehash = ... (py3 !) YYYY/MM/DD HH:MM:SS (PID)> confighash = ... mtimehash = ... (no-setprocname !)
YYYY/MM/DD HH:MM:SS (PID)> forked worker process (pid=...) YYYY/MM/DD HH:MM:SS (PID)> forked worker process (pid=...)
YYYY/MM/DD HH:MM:SS (PID)> setprocname: ... (no-py3 !) YYYY/MM/DD HH:MM:SS (PID)> setprocname: ... (setprocname !)
YYYY/MM/DD HH:MM:SS (PID)> received fds: ... YYYY/MM/DD HH:MM:SS (PID)> received fds: ...
YYYY/MM/DD HH:MM:SS (PID)> chdir to '$TESTTMP/extreload' YYYY/MM/DD HH:MM:SS (PID)> chdir to '$TESTTMP/extreload'
YYYY/MM/DD HH:MM:SS (PID)> setumask 18 YYYY/MM/DD HH:MM:SS (PID)> setumask 18
YYYY/MM/DD HH:MM:SS (PID)> setenv: ... YYYY/MM/DD HH:MM:SS (PID)> setenv: ...
YYYY/MM/DD HH:MM:SS (PID)> confighash = ... mtimehash = ... YYYY/MM/DD HH:MM:SS (PID)> confighash = ... mtimehash = ...
YYYY/MM/DD HH:MM:SS (PID)> validate: [] YYYY/MM/DD HH:MM:SS (PID)> validate: []
YYYY/MM/DD HH:MM:SS (PID)> worker process exited (pid=...) YYYY/MM/DD HH:MM:SS (PID)> worker process exited (pid=...)
YYYY/MM/DD HH:MM:SS (PID)> $TESTTMP/extreload/chgsock/server-... is not owned, exiting. YYYY/MM/DD HH:MM:SS (PID)> $TESTTMP/extreload/chgsock/server-... is not owned, exiting.