| Alphare |
| hg-reviewers |
This removes the last references to PYTHON3.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/run-tests.py (5 lines) |
| if sys.version_info < (3, 5, 0): | if sys.version_info < (3, 5, 0): | ||||
| print( | print( | ||||
| '%s is only supported on Python 3.5+, not %s' | '%s is only supported on Python 3.5+, not %s' | ||||
| % (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])) | % (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])) | ||||
| ) | ) | ||||
| sys.exit(70) # EX_SOFTWARE from `man 3 sysexit` | sys.exit(70) # EX_SOFTWARE from `man 3 sysexit` | ||||
| PYTHON3 = True | |||||
| xrange = range # we use xrange in one place, and we'd rather not use range | xrange = range # we use xrange in one place, and we'd rather not use range | ||||
| def _sys2bytes(p): | def _sys2bytes(p): | ||||
| if p is None: | if p is None: | ||||
| return p | return p | ||||
| return p.encode('utf-8') | return p.encode('utf-8') | ||||
| # LOCALIP could be ::1 or 127.0.0.1. Useful for tests that require raw | # LOCALIP could be ::1 or 127.0.0.1. Useful for tests that require raw | ||||
| # IP addresses. | # IP addresses. | ||||
| env['LOCALIP'] = _bytes2sys(self._localip()) | env['LOCALIP'] = _bytes2sys(self._localip()) | ||||
| # This has the same effect as Py_LegacyWindowsStdioFlag in exewrapper.c, | # This has the same effect as Py_LegacyWindowsStdioFlag in exewrapper.c, | ||||
| # but this is needed for testing python instances like dummyssh, | # but this is needed for testing python instances like dummyssh, | ||||
| # dummysmtpd.py, and dumbhttp.py. | # dummysmtpd.py, and dumbhttp.py. | ||||
| if PYTHON3 and WINDOWS: | if WINDOWS: | ||||
| env['PYTHONLEGACYWINDOWSSTDIO'] = '1' | env['PYTHONLEGACYWINDOWSSTDIO'] = '1' | ||||
| # Modified HOME in test environment can confuse Rust tools. So set | # Modified HOME in test environment can confuse Rust tools. So set | ||||
| # CARGO_HOME and RUSTUP_HOME automatically if a Rust toolchain is | # CARGO_HOME and RUSTUP_HOME automatically if a Rust toolchain is | ||||
| # present and these variables aren't already defined. | # present and these variables aren't already defined. | ||||
| cargo_home_path = os.path.expanduser('~/.cargo') | cargo_home_path = os.path.expanduser('~/.cargo') | ||||
| rustup_home_path = os.path.expanduser('~/.rustup') | rustup_home_path = os.path.expanduser('~/.rustup') | ||||
| tests = [self._gettest(d, i) for i, d in enumerate(testdescs)] | tests = [self._gettest(d, i) for i, d in enumerate(testdescs)] | ||||
| num_tests = len(tests) * self.options.runs_per_test | num_tests = len(tests) * self.options.runs_per_test | ||||
| jobs = min(num_tests, self.options.jobs) | jobs = min(num_tests, self.options.jobs) | ||||
| failed = False | failed = False | ||||
| kws = self.options.keywords | kws = self.options.keywords | ||||
| if kws is not None and PYTHON3: | if kws is not None: | ||||
| kws = kws.encode('utf-8') | kws = kws.encode('utf-8') | ||||
| suite = TestSuite( | suite = TestSuite( | ||||
| self._testdir, | self._testdir, | ||||
| jobs=jobs, | jobs=jobs, | ||||
| whitelist=self.options.whitelisted, | whitelist=self.options.whitelisted, | ||||
| blacklist=self.options.blacklist, | blacklist=self.options.blacklist, | ||||
| keywords=kws, | keywords=kws, | ||||