comparison tests/run-tests.py @ 44144:bd0de73cf810

run-tests: remove --py3-warnings

This Python 2 only mode was to help Python 2 alert when doing
things not supported on Python 3. Now that we have test coverage with
Python 3, I don't think we need it.

Differential Revision: https://phab.mercurial-scm.org/D7978

44143:7f86426fdd2c

        "--pure",
        action="store_true",
        help="use pure Python code instead of C extensions",
    )
    hgconf.add_argument(
        "-3",
        "--py3-warnings",
        action="store_true",
        help="enable Py3k warnings on Python 2.7+",
    )
    hgconf.add_argument(
        "--with-chg",
        metavar="CHG",
        help="use specified chg wrapper in place of hg",
    )
    hgconf.add_argument(

            sys.stderr.write(
                'warning: --slowtimeout option ignored with --debug\n'
            )
        options.timeout = 0
        options.slowtimeout = 0
    if options.py3_warnings:
        if PYTHON3:
            parser.error('--py3-warnings can only be used on Python 2.7')

    if options.blacklist:
        options.blacklist = parselistfiles(options.blacklist, 'blacklist')
    if options.whitelist:
        options.whitelisted = parselistfiles(options.whitelist, 'whitelist')

        debug=False,
        first=False,
        timeout=None,
        startport=None,
        extraconfigopts=None,
        py3warnings=False,
        shell=None,
        hgcommand=None,
        slowtimeout=None,
        usechg=False,
        useipv6=False,

        instances.

        extraconfigopts is an iterable of extra hgrc config options. Values
        must have the form "key=value" (something understood by hgrc). Values
        of the form "foo.key=value" will result in "[foo] key=value".

        py3warnings enables Py3k warnings.

        shell is the shell to execute tests in.
        """
        if timeout is None:
            timeout = defaults['timeout']

        self._first = first
        self._timeout = timeout
        self._slowtimeout = slowtimeout
        self._startport = startport
        self._extraconfigopts = extraconfigopts or []
        self._py3warnings = py3warnings
        self._shell = _bytespath(shell)
        self._hgcommand = hgcommand or b'hg'
        self._usechg = usechg
        self._useipv6 = useipv6

    @property
    def refpath(self):
        return os.path.join(self._testdir, b'%s.out' % self.bname)

    def _run(self, env):
        py3switch = self._py3warnings and b' -3' or b''
        # Quote the python(3) executable for Windows
        cmd = b'"%s"%s "%s"' % (PYTHON, py3switch, self.path)
        vlog("# Running", cmd.decode("utf-8"))
        normalizenewlines = os.name == 'nt'
        result = self._runcommand(cmd, env, normalizenewlines=normalizenewlines)
        if self._aborted:
            raise KeyboardInterrupt()

            debug=self.options.debug,
            first=self.options.first,
            timeout=self.options.timeout,
            startport=self._getport(count),
            extraconfigopts=self.options.extra_config_opt,
            py3warnings=self.options.py3_warnings,
            shell=self.options.shell,
            hgcommand=self._hgcommand,
            usechg=bool(self.options.with_chg or self.options.chg),
            useipv6=useipv6,
            **kwds

            sys.exit(1)
        os.chdir(self._testdir)

        self._usecorrectpython()

        if self.options.py3_warnings and not self.options.anycoverage:
            vlog("# Updating hg command to enable Py3k Warnings switch")
            with open(os.path.join(self._bindir, 'hg'), 'rb') as f:
                lines = [line.rstrip() for line in f]
                lines[0] += ' -3'
            with open(os.path.join(self._bindir, 'hg'), 'wb') as f:
                for line in lines:
                    f.write(line + '\n')

        hgbat = os.path.join(self._bindir, b'hg.bat')
        if os.path.isfile(hgbat):
            # hg.bat expects to be put in bin/scripts while run-tests.py
            # installation layout put it in bin/ directly. Fix it
            with open(hgbat, 'rb') as f:

44144:bd0de73cf810

        "--pure",
        action="store_true",
        help="use pure Python code instead of C extensions",
    )
    hgconf.add_argument(
        "--with-chg",
        metavar="CHG",
        help="use specified chg wrapper in place of hg",
    )
    hgconf.add_argument(

            sys.stderr.write(
                'warning: --slowtimeout option ignored with --debug\n'
            )
        options.timeout = 0
        options.slowtimeout = 0

    if options.blacklist:
        options.blacklist = parselistfiles(options.blacklist, 'blacklist')
    if options.whitelist:
        options.whitelisted = parselistfiles(options.whitelist, 'whitelist')

        debug=False,
        first=False,
        timeout=None,
        startport=None,
        extraconfigopts=None,
        shell=None,
        hgcommand=None,
        slowtimeout=None,
        usechg=False,
        useipv6=False,

        instances.

        extraconfigopts is an iterable of extra hgrc config options. Values
        must have the form "key=value" (something understood by hgrc). Values
        of the form "foo.key=value" will result in "[foo] key=value".

        shell is the shell to execute tests in.
        """
        if timeout is None:
            timeout = defaults['timeout']

        self._first = first
        self._timeout = timeout
        self._slowtimeout = slowtimeout
        self._startport = startport
        self._extraconfigopts = extraconfigopts or []
        self._shell = _bytespath(shell)
        self._hgcommand = hgcommand or b'hg'
        self._usechg = usechg
        self._useipv6 = useipv6

    @property
    def refpath(self):
        return os.path.join(self._testdir, b'%s.out' % self.bname)

    def _run(self, env):
        # Quote the python(3) executable for Windows
        cmd = b'"%s" "%s"' % (PYTHON, self.path)
        vlog("# Running", cmd.decode("utf-8"))
        normalizenewlines = os.name == 'nt'
        result = self._runcommand(cmd, env, normalizenewlines=normalizenewlines)
        if self._aborted:
            raise KeyboardInterrupt()

            debug=self.options.debug,
            first=self.options.first,
            timeout=self.options.timeout,
            startport=self._getport(count),
            extraconfigopts=self.options.extra_config_opt,
            shell=self.options.shell,
            hgcommand=self._hgcommand,
            usechg=bool(self.options.with_chg or self.options.chg),
            useipv6=useipv6,
            **kwds

            sys.exit(1)
        os.chdir(self._testdir)

        self._usecorrectpython()

        hgbat = os.path.join(self._bindir, b'hg.bat')
        if os.path.isfile(hgbat):
            # hg.bat expects to be put in bin/scripts while run-tests.py
            # installation layout put it in bin/ directly. Fix it
            with open(hgbat, 'rb') as f: