| hg-reviewers |
This code path was obviously not tested on Python 3 because it
blew up in several places due to str/bytes mismatch.
For internal code, we normalize paths to bytes.
For code calling into coverage, we normalize paths to str,
which is what coverage seems to expect.
After this, run-tests.py -H works on Python 3!
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| b'"%~dp0python" "%~dp0hg" %*', | b'"%~dp0python" "%~dp0hg" %*', | ||||
| ) | ) | ||||
| with open(hgbat, 'wb') as f: | with open(hgbat, 'wb') as f: | ||||
| f.write(data) | f.write(data) | ||||
| else: | else: | ||||
| print('WARNING: cannot fix hg.bat reference to python.exe') | print('WARNING: cannot fix hg.bat reference to python.exe') | ||||
| if self.options.anycoverage: | if self.options.anycoverage: | ||||
| custom = os.path.join(osenvironb[b'RUNTESTDIR'], 'sitecustomize.py') | custom = os.path.join( | ||||
| target = os.path.join(self._pythondir, 'sitecustomize.py') | osenvironb[b'RUNTESTDIR'], b'sitecustomize.py' | ||||
| ) | |||||
| target = os.path.join(self._pythondir, b'sitecustomize.py') | |||||
| vlog('# Installing coverage trigger to %s' % target) | vlog('# Installing coverage trigger to %s' % target) | ||||
| shutil.copyfile(custom, target) | shutil.copyfile(custom, target) | ||||
| rc = os.path.join(self._testdir, '.coveragerc') | rc = os.path.join(self._testdir, b'.coveragerc') | ||||
| vlog('# Installing coverage rc to %s' % rc) | vlog('# Installing coverage rc to %s' % rc) | ||||
| os.environ['COVERAGE_PROCESS_START'] = rc | osenvironb[b'COVERAGE_PROCESS_START'] = rc | ||||
| covdir = os.path.join(self._installdir, '..', 'coverage') | covdir = os.path.join(self._installdir, b'..', b'coverage') | ||||
| try: | try: | ||||
| os.mkdir(covdir) | os.mkdir(covdir) | ||||
| except OSError as e: | except OSError as e: | ||||
| if e.errno != errno.EEXIST: | if e.errno != errno.EEXIST: | ||||
| raise | raise | ||||
| os.environ['COVERAGE_DIR'] = covdir | osenvironb[b'COVERAGE_DIR'] = covdir | ||||
| def _checkhglib(self, verb): | def _checkhglib(self, verb): | ||||
| """Ensure that the 'mercurial' package imported by python is | """Ensure that the 'mercurial' package imported by python is | ||||
| the one we expect it to be. If not, print a warning to stderr.""" | the one we expect it to be. If not, print a warning to stderr.""" | ||||
| if (self._bindir == self._pythondir) and ( | if (self._bindir == self._pythondir) and ( | ||||
| self._bindir != self._tmpbindir | self._bindir != self._tmpbindir | ||||
| ): | ): | ||||
| # The pythondir has been inferred from --with-hg flag. | # The pythondir has been inferred from --with-hg flag. | ||||
| import coverage | import coverage | ||||
| coverage = coverage.coverage | coverage = coverage.coverage | ||||
| vlog('# Producing coverage report') | vlog('# Producing coverage report') | ||||
| # chdir is the easiest way to get short, relative paths in the | # chdir is the easiest way to get short, relative paths in the | ||||
| # output. | # output. | ||||
| os.chdir(self._hgroot) | os.chdir(self._hgroot) | ||||
| covdir = os.path.join(self._installdir, '..', 'coverage') | covdir = os.path.join(_strpath(self._installdir), '..', 'coverage') | ||||
| cov = coverage(data_file=os.path.join(covdir, 'cov')) | cov = coverage(data_file=os.path.join(covdir, 'cov')) | ||||
| # Map install directory paths back to source directory. | # Map install directory paths back to source directory. | ||||
| cov.config.paths['srcdir'] = ['.', self._pythondir] | cov.config.paths['srcdir'] = ['.', _strpath(self._pythondir)] | ||||
| cov.combine() | cov.combine() | ||||
| omit = [os.path.join(x, '*') for x in [self._bindir, self._testdir]] | omit = [ | ||||
| _strpath(os.path.join(x, b'*')) | |||||
| for x in [self._bindir, self._testdir] | |||||
| ] | |||||
| cov.report(ignore_errors=True, omit=omit) | cov.report(ignore_errors=True, omit=omit) | ||||
| if self.options.htmlcov: | if self.options.htmlcov: | ||||
| htmldir = os.path.join(self._outputdir, 'htmlcov') | htmldir = os.path.join(_strpath(self._outputdir), 'htmlcov') | ||||
| cov.html_report(directory=htmldir, omit=omit) | cov.html_report(directory=htmldir, omit=omit) | ||||
| if self.options.annotate: | if self.options.annotate: | ||||
| adir = os.path.join(self._outputdir, 'annotated') | adir = os.path.join(_strpath(self._outputdir), 'annotated') | ||||
| if not os.path.isdir(adir): | if not os.path.isdir(adir): | ||||
| os.mkdir(adir) | os.mkdir(adir) | ||||
| cov.annotate(directory=adir, omit=omit) | cov.annotate(directory=adir, omit=omit) | ||||
| def _findprogram(self, program): | def _findprogram(self, program): | ||||
| """Search PATH for a executable program""" | """Search PATH for a executable program""" | ||||
| dpb = _bytespath(os.defpath) | dpb = _bytespath(os.defpath) | ||||
| sepb = _bytespath(os.pathsep) | sepb = _bytespath(os.pathsep) | ||||