( )⚙ D7978 run-tests: remove --py3-warnings

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7978

run-tests: remove --py3-warnings
ClosedPublic

Authored by indygreg on Jan 23 2020, 1:54 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGbd0de73cf810: run-tests: remove --py3-warnings
Summary

This Python 2 only mode was to help Python 2 alert when doing
things not supported on Python 3. Now that we have test coverage with
Python 3, I don't think we need it.

Diff Detail

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

Event Timeline

indygreg created this revision.Jan 23 2020, 1:54 AM
pulkit accepted this revision.Jan 23 2020, 7:01 AM
This revision is now accepted and ready to land.Jan 23 2020, 7:01 AM
indygreg added a commit: rHGbd0de73cf810: run-tests: remove --py3-warnings.Jan 23 2020, 7:32 AM
Closed by commit rHGbd0de73cf810: run-tests: remove --py3-warnings (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 19530

tests/run-tests.py

help="prefer IPv6 to IPv4 for network related tests", help="prefer IPv6 to IPv4 for network related tests",
) )
hgconf.add_argument( hgconf.add_argument(
"--pure", "--pure",
action="store_true", action="store_true",
help="use pure Python code instead of C extensions", help="use pure Python code instead of C extensions",
) )
hgconf.add_argument( hgconf.add_argument(
"-3",
"--py3-warnings",
action="store_true",
help="enable Py3k warnings on Python 2.7+",
)
hgconf.add_argument(
"--with-chg", "--with-chg",
metavar="CHG", metavar="CHG",
help="use specified chg wrapper in place of hg", help="use specified chg wrapper in place of hg",
) )
hgconf.add_argument( hgconf.add_argument(
"--with-hg", "--with-hg",
metavar="HG", metavar="HG",
help="test using specified hg script rather than a " help="test using specified hg script rather than a "
if options.timeout != defaults['timeout']: if options.timeout != defaults['timeout']:
sys.stderr.write('warning: --timeout option ignored with --debug\n') sys.stderr.write('warning: --timeout option ignored with --debug\n')
if options.slowtimeout != defaults['slowtimeout']: if options.slowtimeout != defaults['slowtimeout']:
sys.stderr.write( sys.stderr.write(
'warning: --slowtimeout option ignored with --debug\n' 'warning: --slowtimeout option ignored with --debug\n'
) )
options.timeout = 0 options.timeout = 0
options.slowtimeout = 0 options.slowtimeout = 0
if options.py3_warnings:
if PYTHON3:
parser.error('--py3-warnings can only be used on Python 2.7')
if options.blacklist: if options.blacklist:
options.blacklist = parselistfiles(options.blacklist, 'blacklist') options.blacklist = parselistfiles(options.blacklist, 'blacklist')
if options.whitelist: if options.whitelist:
options.whitelisted = parselistfiles(options.whitelist, 'whitelist') options.whitelisted = parselistfiles(options.whitelist, 'whitelist')
else: else:
options.whitelisted = {} options.whitelisted = {}
outputdir, outputdir,
tmpdir, tmpdir,
keeptmpdir=False, keeptmpdir=False,
debug=False, debug=False,
first=False, first=False,
timeout=None, timeout=None,
startport=None, startport=None,
extraconfigopts=None, extraconfigopts=None,
py3warnings=False,
shell=None, shell=None,
hgcommand=None, hgcommand=None,
slowtimeout=None, slowtimeout=None,
usechg=False, usechg=False,
useipv6=False, useipv6=False,
): ):
"""Create a test from parameters. """Create a test from parameters.
test will reserve 3 port numbers for execution. It is the caller's test will reserve 3 port numbers for execution. It is the caller's
responsibility to allocate a non-overlapping port range to Test responsibility to allocate a non-overlapping port range to Test
instances. instances.
extraconfigopts is an iterable of extra hgrc config options. Values extraconfigopts is an iterable of extra hgrc config options. Values
must have the form "key=value" (something understood by hgrc). Values must have the form "key=value" (something understood by hgrc). Values
of the form "foo.key=value" will result in "[foo] key=value". of the form "foo.key=value" will result in "[foo] key=value".
py3warnings enables Py3k warnings.
shell is the shell to execute tests in. shell is the shell to execute tests in.
""" """
if timeout is None: if timeout is None:
timeout = defaults['timeout'] timeout = defaults['timeout']
if startport is None: if startport is None:
startport = defaults['port'] startport = defaults['port']
if slowtimeout is None: if slowtimeout is None:
slowtimeout = defaults['slowtimeout'] slowtimeout = defaults['slowtimeout']
self.path = path self.path = path
self.bname = os.path.basename(path) self.bname = os.path.basename(path)
self.name = _strpath(self.bname) self.name = _strpath(self.bname)
self._testdir = os.path.dirname(path) self._testdir = os.path.dirname(path)
self._outputdir = outputdir self._outputdir = outputdir
self._tmpname = os.path.basename(path) self._tmpname = os.path.basename(path)
self.errpath = os.path.join(self._outputdir, b'%s.err' % self.bname) self.errpath = os.path.join(self._outputdir, b'%s.err' % self.bname)
self._threadtmp = tmpdir self._threadtmp = tmpdir
self._keeptmpdir = keeptmpdir self._keeptmpdir = keeptmpdir
self._debug = debug self._debug = debug
self._first = first self._first = first
self._timeout = timeout self._timeout = timeout
self._slowtimeout = slowtimeout self._slowtimeout = slowtimeout
self._startport = startport self._startport = startport
self._extraconfigopts = extraconfigopts or [] self._extraconfigopts = extraconfigopts or []
self._py3warnings = py3warnings
self._shell = _bytespath(shell) self._shell = _bytespath(shell)
self._hgcommand = hgcommand or b'hg' self._hgcommand = hgcommand or b'hg'
self._usechg = usechg self._usechg = usechg
self._useipv6 = useipv6 self._useipv6 = useipv6
self._aborted = False self._aborted = False
self._daemonpids = [] self._daemonpids = []
self._finished = None self._finished = None
class PythonTest(Test): class PythonTest(Test):
"""A Python-based test.""" """A Python-based test."""
@property @property
def refpath(self): def refpath(self):
return os.path.join(self._testdir, b'%s.out' % self.bname) return os.path.join(self._testdir, b'%s.out' % self.bname)
def _run(self, env): def _run(self, env):
py3switch = self._py3warnings and b' -3' or b''
# Quote the python(3) executable for Windows # Quote the python(3) executable for Windows
cmd = b'"%s"%s "%s"' % (PYTHON, py3switch, self.path) cmd = b'"%s" "%s"' % (PYTHON, self.path)
vlog("# Running", cmd.decode("utf-8")) vlog("# Running", cmd.decode("utf-8"))
normalizenewlines = os.name == 'nt' normalizenewlines = os.name == 'nt'
result = self._runcommand(cmd, env, normalizenewlines=normalizenewlines) result = self._runcommand(cmd, env, normalizenewlines=normalizenewlines)
if self._aborted: if self._aborted:
raise KeyboardInterrupt() raise KeyboardInterrupt()
return result return result
self._outputdir, self._outputdir,
tmpdir, tmpdir,
keeptmpdir=self.options.keep_tmpdir, keeptmpdir=self.options.keep_tmpdir,
debug=self.options.debug, debug=self.options.debug,
first=self.options.first, first=self.options.first,
timeout=self.options.timeout, timeout=self.options.timeout,
startport=self._getport(count), startport=self._getport(count),
extraconfigopts=self.options.extra_config_opt, extraconfigopts=self.options.extra_config_opt,
py3warnings=self.options.py3_warnings,
shell=self.options.shell, shell=self.options.shell,
hgcommand=self._hgcommand, hgcommand=self._hgcommand,
usechg=bool(self.options.with_chg or self.options.chg), usechg=bool(self.options.with_chg or self.options.chg),
useipv6=useipv6, useipv6=useipv6,
**kwds **kwds
) )
t.should_reload = True t.should_reload = True
return t return t
sys.stdout.buffer.write(line) sys.stdout.buffer.write(line)
else: else:
sys.stdout.write(line) sys.stdout.write(line)
sys.exit(1) sys.exit(1)
os.chdir(self._testdir) os.chdir(self._testdir)
self._usecorrectpython() self._usecorrectpython()
if self.options.py3_warnings and not self.options.anycoverage:
vlog("# Updating hg command to enable Py3k Warnings switch")
with open(os.path.join(self._bindir, 'hg'), 'rb') as f:
lines = [line.rstrip() for line in f]
lines[0] += ' -3'
with open(os.path.join(self._bindir, 'hg'), 'wb') as f:
for line in lines:
f.write(line + '\n')
hgbat = os.path.join(self._bindir, b'hg.bat') hgbat = os.path.join(self._bindir, b'hg.bat')
if os.path.isfile(hgbat): if os.path.isfile(hgbat):
# hg.bat expects to be put in bin/scripts while run-tests.py # hg.bat expects to be put in bin/scripts while run-tests.py
# installation layout put it in bin/ directly. Fix it # installation layout put it in bin/ directly. Fix it
with open(hgbat, 'rb') as f: with open(hgbat, 'rb') as f:
data = f.read() data = f.read()
if br'"%~dp0..\python" "%~dp0hg" %*' in data: if br'"%~dp0..\python" "%~dp0hg" %*' in data:
data = data.replace( data = data.replace(