Commit 605cc214 authored by Stefan Behnel's avatar Stefan Behnel

Simplify some Py2 checks in the test runner.

parent adf1223d
...@@ -29,6 +29,7 @@ try: ...@@ -29,6 +29,7 @@ try:
except (ImportError, AttributeError): except (ImportError, AttributeError):
IS_CPYTHON = True IS_CPYTHON = True
IS_PYPY = False IS_PYPY = False
IS_PY2 = sys.version_info[0] < 3
from io import open as io_open from io import open as io_open
try: try:
...@@ -1913,7 +1914,7 @@ class ShardExcludeSelector(object): ...@@ -1913,7 +1914,7 @@ class ShardExcludeSelector(object):
self.shard_num = shard_num self.shard_num = shard_num
self.shard_count = shard_count self.shard_count = shard_count
def __call__(self, testname, tags=None, _hash=zlib.crc32, _is_py2=sys.version_info[0] < 3): def __call__(self, testname, tags=None, _hash=zlib.crc32, _is_py2=IS_PY2):
# Cannot use simple hash() here as shard processes might use different hash seeds. # Cannot use simple hash() here as shard processes might use different hash seeds.
# CRC32 is fast and simple, but might return negative values in Py2. # CRC32 is fast and simple, but might return negative values in Py2.
hashval = _hash(testname) & 0x7fffffff if _is_py2 else _hash(testname.encode()) hashval = _hash(testname) & 0x7fffffff if _is_py2 else _hash(testname.encode())
...@@ -2495,10 +2496,7 @@ def runtests(options, cmd_args, coverage=None): ...@@ -2495,10 +2496,7 @@ def runtests(options, cmd_args, coverage=None):
else: else:
text_runner_options = {} text_runner_options = {}
if options.failfast: if options.failfast:
if sys.version_info < (2, 7): text_runner_options['failfast'] = True
sys.stderr.write("--failfast not supported with Python < 2.7\n")
else:
text_runner_options['failfast'] = True
test_runner = unittest.TextTestRunner(verbosity=options.verbosity, **text_runner_options) test_runner = unittest.TextTestRunner(verbosity=options.verbosity, **text_runner_options)
if options.pyximport_py: if options.pyximport_py:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment