comparison tests/run-tests.py @ 33695:eeed23508383

run-tests: drop required (feature !) style lines when the output is missing

Essentially, these were acting as a verbose (?) flag, since they weren't being
dropped when required.  Foozy has a nice description [1].  Basically, a couple
more places needed to check the features before treating it as optional.

I don't like how test-run-tests.py had to be hacked, but _hghave() can't be made
a static method.  The test change was a change while developing `debugssl`,
prior to tightening up the cases where the message is printed, that this fix
would have caught.

[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-July/101941.html

33694:93422d0068f8

                i = 0
                optional = []
                while i < len(els):
                    el = els[i]

                    r = TTest.linematch(el, lout)
                    if isinstance(r, str):
                        if r == '+glob':
                            lout = el[:-1] + ' (glob)\n'
                            r = '' # Warn only this line.
                        elif r == '-glob':

                        else:
                            m = optline.match(el)
                            if m:
                                conditions = [c for c in m.group(2).split(' ')]

                                if self._hghave(conditions)[0]:
                                    lout = el
                                else:
                                    optional.append(i)

                    i += 1

                if r:

            else:
                # clean up any optional leftovers
                while expected.get(pos, None):
                    el = expected[pos].pop(0)
                    if el:
                        if (not optline.match(el)
                            and not el.endswith(b" (?)\n")):
                            break
                    postout.append(b'  ' + el)

            if lcmd:
                # Add on last return code.
                ret = int(lcmd.split()[1])

                res += b'[/\\\\]'
            else:
                res += re.escape(c)
        return TTest.rematch(res, l)

    @staticmethod
    def linematch(el, l):
        retry = False
        if el == l: # perfect match (fast)
            return True
        if el:
            if el.endswith(b" (?)\n"):
                retry = "retry"
                el = el[:-5] + b"\n"
            else:
                m = optline.match(el)
                if m:
                    el = m.group(1) + b"\n"
                    retry = "retry"

            if el.endswith(b" (esc)\n"):
                if PYTHON3:
                    el = el[:-7].decode('unicode_escape') + '\n'
                    el = el.encode('utf-8')

33695:eeed23508383

                i = 0
                optional = []
                while i < len(els):
                    el = els[i]

                    r = self.linematch(el, lout)
                    if isinstance(r, str):
                        if r == '+glob':
                            lout = el[:-1] + ' (glob)\n'
                            r = '' # Warn only this line.
                        elif r == '-glob':

                        else:
                            m = optline.match(el)
                            if m:
                                conditions = [c for c in m.group(2).split(' ')]

                                if not self._hghave(conditions)[0]:
                                    optional.append(i)

                    i += 1

                if r:

            else:
                # clean up any optional leftovers
                while expected.get(pos, None):
                    el = expected[pos].pop(0)
                    if el:
                        if not el.endswith(b" (?)\n"):
                            m = optline.match(el)
                            if m:
                                conditions = [c for c in m.group(2).split(' ')]

                                if self._hghave(conditions)[0]:
                                    # Don't append as optional line
                                    continue
                            else:
                                break
                    postout.append(b'  ' + el)

            if lcmd:
                # Add on last return code.
                ret = int(lcmd.split()[1])

                res += b'[/\\\\]'
            else:
                res += re.escape(c)
        return TTest.rematch(res, l)

    def linematch(self, el, l):
        retry = False
        if el == l: # perfect match (fast)
            return True
        if el:
            if el.endswith(b" (?)\n"):
                retry = "retry"
                el = el[:-5] + b"\n"
            else:
                m = optline.match(el)
                if m:
                    conditions = [c for c in m.group(2).split(' ')]

                    el = m.group(1) + b"\n"
                    if not self._hghave(conditions)[0]:
                        retry = "retry"    # Not required by listed features

            if el.endswith(b" (esc)\n"):
                if PYTHON3:
                    el = el[:-7].decode('unicode_escape') + '\n'
                    el = el.encode('utf-8')