comparison tests/run-tests.py @ 40263:8cf459d8b111

py3: use py3 as the test tag, dropping the k

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

40262:c8f164061212

             "and --with-chg=<testdir>/../contrib/chg/chg if --chg is set")
    hgconf.add_argument("--ipv6", action="store_true",
        help="prefer IPv6 to IPv4 for network related tests")
    hgconf.add_argument("--pure", action="store_true",
        help="use pure Python code instead of C extensions")
    hgconf.add_argument("-3", "--py3k-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("--with-hg",
        metavar="HG",

        if options.slowtimeout != defaults['slowtimeout']:
            sys.stderr.write(
                'warning: --slowtimeout option ignored with --debug\n')
        options.timeout = 0
        options.slowtimeout = 0
    if options.py3k_warnings:
        if PYTHON3:
            parser.error(
                '--py3k-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')

    def __init__(self, path, outputdir, tmpdir, keeptmpdir=False,
                 debug=False,
                 first=False,
                 timeout=None,
                 startport=None, extraconfigopts=None,
                 py3kwarnings=False, shell=None, hgcommand=None,
                 slowtimeout=None, usechg=False,
                 useipv6=False):
        """Create a test from parameters.

        path is the full path to the file defining the test.

        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".

        py3kwarnings 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._py3kwarnings = py3kwarnings
        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):
        py3kswitch = self._py3kwarnings and b' -3' or b''
        cmd = b'"%s"%s "%s"' % (PYTHON, py3kswitch, self.path)
        vlog("# Running", cmd)
        normalizenewlines = os.name == 'nt'
        result = self._runcommand(cmd, env,
                                  normalizenewlines=normalizenewlines)
        if self._aborted:

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

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

        self._usecorrectpython()

        if self.options.py3k_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:

40263:8cf459d8b111

             "and --with-chg=<testdir>/../contrib/chg/chg if --chg is set")
    hgconf.add_argument("--ipv6", action="store_true",
        help="prefer IPv6 to IPv4 for network related tests")
    hgconf.add_argument("--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("--with-hg",
        metavar="HG",

        if options.slowtimeout != defaults['slowtimeout']:
            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')

    def __init__(self, path, outputdir, tmpdir, keeptmpdir=False,
                 debug=False,
                 first=False,
                 timeout=None,
                 startport=None, extraconfigopts=None,
                 py3warnings=False, shell=None, hgcommand=None,
                 slowtimeout=None, usechg=False,
                 useipv6=False):
        """Create a test from parameters.

        path is the full path to the file defining the test.

        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''
        cmd = b'%s%s "%s"' % (PYTHON, py3switch, self.path)
        vlog("# Running", cmd)
        normalizenewlines = os.name == 'nt'
        result = self._runcommand(cmd, env,
                                  normalizenewlines=normalizenewlines)
        if self._aborted:

                    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)
        t.should_reload = True

            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: