##// END OF EJS Templates
dummysmtpd: don't die on client connection errors...
dummysmtpd: don't die on client connection errors The connection refused error in test-patchbomb-tls.t[1] is sporadic, but one of the more often seen errors on Windows. I added enough logging to a file and dumped it out at the end to make the following observations: - The listening socket is successfully created and bound to the port, and the "listening at..." message is always logged. - Generally, the following is the entire log output, with the "accepted ..." message having been added after `sslutil.wrapserversocket`: listening at localhost:$HGPORT $LOCALIP ssl error accepted connect accepted connect $LOCALIP from=quux to=foo, bar $LOCALIP ssl error - In the cases that fail, asyncore.loop() in the run() method is exiting, but not with an exception. - In the cases that fail, the following is logged right after "listening ...": Traceback (most recent call last): File "c:\\Python27\\lib\\asyncore.py", line 83, in read obj.handle_read_event() File "c:\\Python27\\lib\\asyncore.py", line 443, in handle_read_event self.handle_accept() File "../tests/dummysmtpd.py", line 80, in handle_accept conn = sslutil.wrapserversocket(conn, ui, certfile=self._certfile) File "..\\mercurial\\sslutil.py", line 570, in wrapserversocket return sslcontext.wrap_socket(sock, server_side=True) File "c:\\Python27\\lib\\ssl.py", line 363, in wrap_socket _context=self) File "c:\\Python27\\lib\\ssl.py", line 611, in __init__ self.do_handshake() File "c:\\Python27\\lib\\ssl.py", line 840, in do_handshake self._sslobj.do_handshake() error: [Errno 10054] $ECONNRESET$ - If the base class handler is overridden completely, the the first "ssl error" line is replaced by the stacktrace, but the other lines are unchanged. The client behaves no differently, whether or not the server stacktraced. In general, `./run-tests.py --local -j9 -t9000 test-patchbomb-tls.t --runs-per-test 20` would show the issue after a run or two. With this change, `./run-tests.py --local -j9 -t9000 test-patchbomb-tls.t --loop` ran 800 times without a hiccup. This makes me wonder if the other connection refused messages that bubble up on occasion are caused by a similar issue. It seems a bit drastic to kill the whole server on account of a single communication failure with a client. # no-check-commit because of handle_error() [1] https://buildbot.mercurial-scm.org/builders/Win7%20x86_64%20hg%20tests/builds/421/steps/run-tests.py%20%28python%202.7.13%29/logs/stdio

File last commit:

r32855:28f429d1 default
r35794:75bae697 default
Show More
python3-ratchet.py
116 lines | 4.3 KiB | text/x-python | PythonLexer
# Copyright 2012 Facebook
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""Find tests that newly pass under Python 3.
The approach is simple: we maintain a whitelist of Python 3 passing
tests in the repository, and periodically run all the /other/ tests
and look for new passes. Any newly passing tests get automatically
added to the whitelist.
You probably want to run it like this:
$ cd tests
$ python3 ../contrib/python3-ratchet.py \
> --working-tests=../contrib/python3-whitelist
"""
from __future__ import print_function
from __future__ import absolute_import
import argparse
import json
import os
import subprocess
import sys
_hgenv = dict(os.environ)
_hgenv.update({
'HGPLAIN': '1',
})
_HG_FIRST_CHANGE = '9117c6561b0bd7792fa13b50d28239d51b78e51f'
def _runhg(*args):
return subprocess.check_output(args, env=_hgenv)
def _is_hg_repo(path):
return _runhg('hg', 'log', '-R', path,
'-r0', '--template={node}').strip() == _HG_FIRST_CHANGE
def _py3default():
if sys.version_info[0] >= 3:
return sys.executable
return 'python3'
def main(argv=()):
p = argparse.ArgumentParser()
p.add_argument('--working-tests',
help='List of tests that already work in Python 3.')
p.add_argument('--commit-to-repo',
help='If set, commit newly fixed tests to the given repo')
p.add_argument('-j', default=os.sysconf(r'SC_NPROCESSORS_ONLN'), type=int,
help='Number of parallel tests to run.')
p.add_argument('--python3', default=_py3default(),
help='python3 interpreter to use for test run')
p.add_argument('--commit-user',
default='python3-ratchet@mercurial-scm.org',
help='Username to specify when committing to a repo.')
opts = p.parse_args(argv)
if opts.commit_to_repo:
if not _is_hg_repo(opts.commit_to_repo):
print('abort: specified repository is not the hg repository')
sys.exit(1)
if not opts.working_tests or not os.path.isfile(opts.working_tests):
print('abort: --working-tests must exist and be a file (got %r)' %
opts.working_tests)
sys.exit(1)
elif opts.commit_to_repo:
root = _runhg('hg', 'root').strip()
if not opts.working_tests.startswith(root):
print('abort: if --commit-to-repo is given, '
'--working-tests must be from that repo')
sys.exit(1)
try:
subprocess.check_call([opts.python3, '-c',
'import sys ; '
'assert ((3, 5) <= sys.version_info < (3, 6) '
'or sys.version_info >= (3, 6, 2))'])
except subprocess.CalledProcessError:
print('warning: Python 3.6.0 and 3.6.1 have '
'a bug which breaks Mercurial')
print('(see https://bugs.python.org/issue29714 for details)')
# TODO(augie): uncomment exit when Python 3.6.2 is available
# sys.exit(1)
rt = subprocess.Popen([opts.python3, 'run-tests.py', '-j', str(opts.j),
'--blacklist', opts.working_tests, '--json'])
rt.wait()
with open('report.json') as f:
data = f.read()
report = json.loads(data.split('=', 1)[1])
newpass = set()
for test, result in report.items():
if result['result'] != 'success':
continue
# A new passing test! Huzzah!
newpass.add(test)
if newpass:
# We already validated the repo, so we can just dive right in
# and commit.
if opts.commit_to_repo:
print(len(newpass), 'new passing tests on Python 3!')
with open(opts.working_tests) as f:
oldpass = {l for l in f.read().splitlines() if l}
with open(opts.working_tests, 'w') as f:
for p in sorted(oldpass | newpass):
f.write('%s\n' % p)
_runhg('hg', 'commit', '-R', opts.commit_to_repo,
'--user', opts.commit_user,
'--message', 'python3: expand list of passing tests')
else:
print('Newly passing tests:', '\n'.join(sorted(newpass)))
sys.exit(2)
if __name__ == '__main__':
main(sys.argv[1:])