This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4343

tests: add support for emitting trace events to run-tests
ClosedPublic

Authored by durin42 on Aug 21 2018, 5:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc496e8c14b9e: tests: add support for emitting trace events to run-tests
Summary

Right now this is pretty basic, but it's a start.

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

durin42 created this revision.Aug 21 2018, 5:39 PM
Closed by commit rHGc496e8c14b9e: tests: add support for emitting trace events to run-tests (authored by durin42). · Explain WhyAug 24 2018, 1:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 10552

tests/run-tests.py

import socket import socket
import subprocess import subprocess
import sys import sys
import sysconfig import sysconfig
import tempfile import tempfile
import threading import threading
import time import time
import unittest import unittest
import uuid
import xml.dom.minidom as minidom import xml.dom.minidom as minidom
try: try:
import Queue as queue import Queue as queue
except ImportError: except ImportError:
import queue import queue
try: try:
env["HGEDITOR"] = ('"' + sys.executable + '"' env["HGEDITOR"] = ('"' + sys.executable + '"'
+ ' -c "import sys; sys.exit(0)"') + ' -c "import sys; sys.exit(0)"')
env["HGMERGE"] = "internal:merge" env["HGMERGE"] = "internal:merge"
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:
env['HGCATAPULTSERVERPIPE'] = '/dev/null'
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)
# up script results with our source. These markers include input # up script results with our source. These markers include input
# line number and the last return code. # line number and the last return code.
salt = b"SALT%d" % time.time() salt = b"SALT%d" % time.time()
def addsalt(line, inpython): def addsalt(line, inpython):
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))
active = []
session = str(uuid.uuid4())
if PYTHON3:
session = session.encode('ascii')
def toggletrace(cmd):
quoted = shellquote(cmd.strip()).replace(b'\\', b'\\\\')
if active:
script.append(
b'echo END %s %s >> "$HGCATAPULTSERVERPIPE"\n' % (
session, active[0]))
script.append(
b'echo START %s %s >> "$HGCATAPULTSERVERPIPE"\n' % (
session, quoted))
active[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
# components, ordered by line number. # components, ordered by line number.
after = {} after = {}
inpython = False inpython = False
if self._debug: if self._debug:
script.append(b'set -x\n') script.append(b'set -x\n')
if self._hgcommand != b'hg': if self._hgcommand != b'hg':
script.append(b'alias hg="%s"\n' % self._hgcommand) script.append(b'alias hg="%s"\n' % self._hgcommand)
if os.getenv('MSYSTEM'): if os.getenv('MSYSTEM'):
script.append(b'alias pwd="pwd -W"\n') script.append(b'alias pwd="pwd -W"\n')
if os.getenv('HGCATAPULTSERVERPIPE'):
# Kludge: use a while loop to keep the pipe from getting
# closed by our echo commands. The still-running file gets
# reaped at the end of the script, which causes the while
# loop to exit and closes the pipe. Sigh.
script.append(
b'rtendtracing() {\n'
b' echo END %(session)s %(name)s >> $HGCATAPULTSERVERPIPE\n'
b' rm -f "$TESTTMP/.still-running"\n'
b'}\n'
b'trap "rtendtracing" 0\n'
b'touch "$TESTTMP/.still-running"\n'
b'while [ -f "$TESTTMP/.still-running" ]; do sleep 1; done '
b'> $HGCATAPULTSERVERPIPE &\n'
b'HGCATAPULTSESSION=%(session)s ; export HGCATAPULTSESSION\n'
b'echo START %(session)s %(name)s >> $HGCATAPULTSERVERPIPE\n'
% {
'name': self.name,
'session': session,
}
)
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:
quoted = shellquote(casestr.decode('utf8')).encode('utf8') quoted = shellquote(casestr.decode('utf8')).encode('utf8')
script.append(b'TESTCASE=%s\n' % quoted) script.append(b'TESTCASE=%s\n' % quoted)
script.append(b'export TESTCASE\n') script.append(b'export TESTCASE\n')
elif l.startswith(b' $ '): # commands elif l.startswith(b' $ '): # commands
if inpython: if inpython:
script.append(b'EOF\n') script.append(b'EOF\n')
inpython = False inpython = False
after.setdefault(pos, []).append(l) after.setdefault(pos, []).append(l)
prepos = pos prepos = pos
pos = n pos = n
addsalt(n, False) addsalt(n, False)
cmd = l[4:].split() rawcmd = l[4:]
cmd = rawcmd.split()
toggletrace(rawcmd)
if len(cmd) == 2 and cmd[0] == b'cd': if len(cmd) == 2 and cmd[0] == b'cd':
l = b' $ cd %s || exit 1\n' % cmd[1] l = b' $ cd %s || exit 1\n' % cmd[1]
script.append(l[4:]) script.append(rawcmd)
elif l.startswith(b' > '): # continuations elif l.startswith(b' > '): # continuations
after.setdefault(prepos, []).append(l) after.setdefault(prepos, []).append(l)
script.append(l[4:]) script.append(l[4:])
elif l.startswith(b' '): # results elif l.startswith(b' '): # results
# Queue up a list of expected results. # Queue up a list of expected results.
expected.setdefault(pos, []).append(l[2:]) expected.setdefault(pos, []).append(l[2:])
else: else:
if inpython: if inpython:
script.append(b'EOF\n') script.append(b'EOF\n')
inpython = False inpython = False
# Non-command/result. Queue up for merged output. # Non-command/result. Queue up for merged output.
after.setdefault(pos, []).append(l) after.setdefault(pos, []).append(l)
if inpython: if inpython:
script.append(b'EOF\n') script.append(b'EOF\n')
if skipping is not None: if skipping is not None:
after.setdefault(pos, []).append(' !!! missing #endif\n') after.setdefault(pos, []).append(' !!! missing #endif\n')
addsalt(n + 1, False) addsalt(n + 1, False)
return salt, script, after, expected return salt, script, after, expected
def _processoutput(self, exitcode, output, salt, after, expected): def _processoutput(self, exitcode, output, salt, after, expected):
# Merge the script output back into a unified test. # Merge the script output back into a unified test.
warnonly = 1 # 1: not yet; 2: yes; 3: for sure not warnonly = 1 # 1: not yet; 2: yes; 3: for sure not
if exitcode != 0: if exitcode != 0:
warnonly = 3 warnonly = 3