This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9452

run-tests: fix a socket context manager for py2
AbandonedPublic

Authored by pulkit on Nov 28 2020, 11:00 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Summary

I broke this in e1404a75cddd, because the socket class lacks __exit__ on py2.

Diff Detail

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

Event Timeline

mharbison72 created this revision.Nov 28 2020, 11:00 PM
mharbison72 added a comment.Nov 28 2020, 11:01 PM

I broke this in e1404a75cddd

Feel free to fold this in there, and keep the original commit message.

pulkit accepted this revision.Nov 29 2020, 8:45 AM
This revision is now accepted and ready to land.Nov 29 2020, 8:45 AM
pulkit requested changes to this revision.Dec 4 2020, 2:24 PM

This was folded and no longer needed. Moving it out of the review queue.

This revision now requires changes to proceed.Dec 4 2020, 2:24 PM
pulkit edited reviewers, added: mharbison72; removed: pulkit.Dec 4 2020, 2:32 PM
pulkit commandeered this revision.
pulkit abandoned this revision.

Revision Contents
Changeset List

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

Diff 23803

tests/run-tests.py

# enough that it's worth doing parallel runs, few enough that it # enough that it's worth doing parallel runs, few enough that it
# completes fairly quickly, includes both shell and Python scripts, and # completes fairly quickly, includes both shell and Python scripts, and
# includes some scripts that run daemon processes.) # includes some scripts that run daemon processes.)
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import argparse import argparse
import collections import collections
import contextlib
import difflib import difflib
import distutils.version as version import distutils.version as version
import errno import errno
import json import json
import multiprocessing import multiprocessing
import os import os
import platform import platform
import random import random
def checkportisavailable(port): def checkportisavailable(port):
"""return true if a port seems free to bind on localhost""" """return true if a port seems free to bind on localhost"""
if useipv6: if useipv6:
family = socket.AF_INET6 family = socket.AF_INET6
else: else:
family = socket.AF_INET family = socket.AF_INET
try: try:
with socket.socket(family, socket.SOCK_STREAM) as s: with contextlib.closing(socket.socket(family, socket.SOCK_STREAM)) as s:
s.bind(('localhost', port)) s.bind(('localhost', port))
return True return True
except socket.error as exc: except socket.error as exc:
if exc.errno not in ( if exc.errno not in (
errno.EADDRINUSE, errno.EADDRINUSE,
errno.EADDRNOTAVAIL, errno.EADDRNOTAVAIL,
errno.EPROTONOSUPPORT, errno.EPROTONOSUPPORT,
): ):