This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5216

catapult: introduce HGTESTCATAPULTSERVERPIPE to control run-tests' tracing
ClosedPublic

Authored by spectral on Nov 1 2018, 8:25 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG889424be7ad2: catapult: introduce HGTESTCATAPULTSERVERPIPE to control run-tests' tracing
Summary

If unset, it will inherit its value from HGCATAPULTSERVERPIPE (which hg itself
also respects). By setting only HGTESTCATAPULTSERVERPIPE, we can get per-command
breakdowns of the test runtimes for the whole test suite without overloading the
trace file with the contents of the tracing from hg (such as demandimport, etc.)

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

spectral created this revision.Nov 1 2018, 8:25 PM
Closed by commit rHG889424be7ad2: catapult: introduce HGTESTCATAPULTSERVERPIPE to control run-tests' tracing (authored by spectral). · Explain WhyNov 5 2018, 11:07 AM
This revision was automatically updated to reflect the committed changes.
markand added a subscriber: markand.Nov 5 2018, 11:32 AM

Guys I wonder if you really consider HGTESTCATAPULTSERVERPIPE as readable.

durin42 added a subscriber: durin42.Nov 5 2018, 1:07 PM
In D5216#77936, @markand wrote:

Guys I wonder if you really consider HGTESTCATAPULTSERVERPIPE as readable.

Not really, but it's hg-developer-only, so I'm not super-inclined to worry about it. I won't turn down patches to improve the situation, I guess?

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (20 lines)

Diff 12395

tests/run-tests.py

b'daemon.pids')) b'daemon.pids'))
env["HGEDITOR"] = ('"' + sys.executable + '"' env["HGEDITOR"] = ('"' + sys.executable + '"'
+ ' -c "import sys; sys.exit(0)"') + ' -c "import sys; sys.exit(0)"')
env["HGUSER"] = "test" env["HGUSER"] = "test"
env["HGENCODING"] = "ascii" env["HGENCODING"] = "ascii"
env["HGENCODINGMODE"] = "strict" env["HGENCODINGMODE"] = "strict"
env["HGHOSTNAME"] = "test-hostname" env["HGHOSTNAME"] = "test-hostname"
env['HGIPV6'] = str(int(self._useipv6)) env['HGIPV6'] = str(int(self._useipv6))
if 'HGCATAPULTSERVERPIPE' not in env: if 'HGTESTCATAPULTSERVERPIPE' not in env:
env['HGCATAPULTSERVERPIPE'] = os.devnull # If we don't have HGTESTCATAPULTSERVERPIPE explicitly set, pull the
# non-test one in as a default, otherwise set to devnull
env['HGTESTCATAPULTSERVERPIPE'] = \
env.get('HGCATAPULTSERVERPIPE', os.devnull)
extraextensions = [] extraextensions = []
for opt in self._extraconfigopts: for opt in self._extraconfigopts:
section, key = opt.encode('utf-8').split(b'.', 1) section, key = opt.encode('utf-8').split(b'.', 1)
if section != 'extensions': if section != 'extensions':
continue continue
name = key.split(b'=', 1)[0] name = key.split(b'=', 1)[0]
extraextensions.append(name) extraextensions.append(name)
if inpython: if inpython:
script.append(b'%s %d 0\n' % (salt, line)) script.append(b'%s %d 0\n' % (salt, line))
else: else:
script.append(b'echo %s %d $?\n' % (salt, line)) script.append(b'echo %s %d $?\n' % (salt, line))
activetrace = [] activetrace = []
session = str(uuid.uuid4()) session = str(uuid.uuid4())
if PYTHON3: if PYTHON3:
session = session.encode('ascii') session = session.encode('ascii')
hgcatapult = os.getenv('HGCATAPULTSERVERPIPE') hgcatapult = os.getenv('HGTESTCATAPULTSERVERPIPE')
def toggletrace(cmd=None): def toggletrace(cmd=None):
if not hgcatapult or hgcatapult == os.devnull: if not hgcatapult or hgcatapult == os.devnull:
return return
if activetrace: if activetrace:
script.append( script.append(
b'echo END %s %s >> "$HGCATAPULTSERVERPIPE"\n' % ( b'echo END %s %s >> "$HGTESTCATAPULTSERVERPIPE"\n' % (
session, activetrace[0])) session, activetrace[0]))
if cmd is None: if cmd is None:
return return
if isinstance(cmd, str): if isinstance(cmd, str):
quoted = shellquote(cmd.strip()) quoted = shellquote(cmd.strip())
else: else:
quoted = shellquote(cmd.strip().decode('utf8')).encode('utf8') quoted = shellquote(cmd.strip().decode('utf8')).encode('utf8')
quoted = quoted.replace(b'\\', b'\\\\') quoted = quoted.replace(b'\\', b'\\\\')
script.append( script.append(
b'echo START %s %s >> "$HGCATAPULTSERVERPIPE"\n' % ( b'echo START %s %s >> "$HGTESTCATAPULTSERVERPIPE"\n' % (
session, quoted)) session, quoted))
activetrace[0:] = [quoted] activetrace[0:] = [quoted]
script = [] script = []
# After we run the shell script, we re-unify the script output # After we run the shell script, we re-unify the script output
# with non-active parts of the source, with synchronization by our # with non-active parts of the source, with synchronization by our
# SALT line number markers. The after table contains the non-active # SALT line number markers. The after table contains the non-active
if hgcatapult and hgcatapult != os.devnull: if hgcatapult and hgcatapult != os.devnull:
# Kludge: use a while loop to keep the pipe from getting # Kludge: use a while loop to keep the pipe from getting
# closed by our echo commands. The still-running file gets # closed by our echo commands. The still-running file gets
# reaped at the end of the script, which causes the while # reaped at the end of the script, which causes the while
# loop to exit and closes the pipe. Sigh. # loop to exit and closes the pipe. Sigh.
script.append( script.append(
b'rtendtracing() {\n' b'rtendtracing() {\n'
b' echo END %(session)s %(name)s >> $HGCATAPULTSERVERPIPE\n' b' echo END %(session)s %(name)s >> %(catapult)s\n'
b' rm -f "$TESTTMP/.still-running"\n' b' rm -f "$TESTTMP/.still-running"\n'
b'}\n' b'}\n'
b'trap "rtendtracing" 0\n' b'trap "rtendtracing" 0\n'
b'touch "$TESTTMP/.still-running"\n' b'touch "$TESTTMP/.still-running"\n'
b'while [ -f "$TESTTMP/.still-running" ]; do sleep 1; done ' b'while [ -f "$TESTTMP/.still-running" ]; do sleep 1; done '
b'> $HGCATAPULTSERVERPIPE &\n' b'> %(catapult)s &\n'
b'HGCATAPULTSESSION=%(session)s ; export HGCATAPULTSESSION\n' b'HGCATAPULTSESSION=%(session)s ; export HGCATAPULTSESSION\n'
b'echo START %(session)s %(name)s >> $HGCATAPULTSERVERPIPE\n' b'echo START %(session)s %(name)s >> %(catapult)s\n'
% { % {
'name': self.name, 'name': self.name,
'session': session, 'session': session,
'catapult': hgcatapult,
} }
) )
if self._case: if self._case:
casestr = b'#'.join(self._case) casestr = b'#'.join(self._case)
if isinstance(self._case, str): if isinstance(self._case, str):
quoted = shellquote(casestr) quoted = shellquote(casestr)
else: else: