| hg-reviewers |
It just seems odd for linematch() to know what None means.
| 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 (66 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| # Find the expected output at the current position. | # Find the expected output at the current position. | ||||
| els = [None] | els = [None] | ||||
| if expected.get(pos, None): | if expected.get(pos, None): | ||||
| els = expected[pos] | els = expected[pos] | ||||
| optional = [] | optional = [] | ||||
| for i, el in enumerate(els): | for i, el in enumerate(els): | ||||
| r = False | |||||
| if el: | |||||
| r = self.linematch(el, lout) | r = self.linematch(el, lout) | ||||
| if isinstance(r, str): | if isinstance(r, str): | ||||
| if r == '-glob': | if r == '-glob': | ||||
| lout = ''.join(el.rsplit(' (glob)', 1)) | lout = ''.join(el.rsplit(' (glob)', 1)) | ||||
| r = '' # Warn only this line. | r = '' # Warn only this line. | ||||
| elif r == "retry": | elif r == "retry": | ||||
| postout.append(b' ' + el) | postout.append(b' ' + el) | ||||
| else: | else: | ||||
| log('\ninfo, unknown linematch result: %r\n' % r) | log('\ninfo, unknown linematch result: %r\n' % r) | ||||
| res += b'.' | res += b'.' | ||||
| elif c == b'/' and os.altsep: | elif c == b'/' and os.altsep: | ||||
| res += b'[/\\\\]' | res += b'[/\\\\]' | ||||
| else: | else: | ||||
| res += re.escape(c) | res += re.escape(c) | ||||
| return TTest.rematch(res, l) | return TTest.rematch(res, l) | ||||
| def linematch(self, el, l): | def linematch(self, el, l): | ||||
| retry = False | |||||
| if el == l: # perfect match (fast) | if el == l: # perfect match (fast) | ||||
| return True | return True | ||||
| if el: | retry = False | ||||
| if el.endswith(b" (?)\n"): | if el.endswith(b" (?)\n"): | ||||
| retry = "retry" | retry = "retry" | ||||
| el = el[:-5] + b"\n" | el = el[:-5] + b"\n" | ||||
| else: | else: | ||||
| m = optline.match(el) | m = optline.match(el) | ||||
| if m: | if m: | ||||
| conditions = [c for c in m.group(2).split(b' ')] | conditions = [c for c in m.group(2).split(b' ')] | ||||
| el = m.group(1) + b"\n" | el = m.group(1) + b"\n" | ||||
| if not self._iftest(conditions): | if not self._iftest(conditions): | ||||
| retry = "retry" # Not required by listed features | retry = "retry" # Not required by listed features | ||||
| if el.endswith(b" (esc)\n"): | if el.endswith(b" (esc)\n"): | ||||
| if PYTHON3: | if PYTHON3: | ||||
| el = el[:-7].decode('unicode_escape') + '\n' | el = el[:-7].decode('unicode_escape') + '\n' | ||||
| el = el.encode('utf-8') | el = el.encode('utf-8') | ||||
| else: | else: | ||||
| el = el[:-7].decode('string-escape') + '\n' | el = el[:-7].decode('string-escape') + '\n' | ||||
| if el == l or os.name == 'nt' and el[:-1] + b'\r\n' == l: | if el == l or os.name == 'nt' and el[:-1] + b'\r\n' == l: | ||||
| return True | return True | ||||
| if el.endswith(b" (re)\n"): | if el.endswith(b" (re)\n"): | ||||
| return TTest.rematch(el[:-6], l) or retry | return TTest.rematch(el[:-6], l) or retry | ||||
| if el.endswith(b" (glob)\n"): | if el.endswith(b" (glob)\n"): | ||||
| # ignore '(glob)' added to l by 'replacements' | # ignore '(glob)' added to l by 'replacements' | ||||
| if l.endswith(b" (glob)\n"): | if l.endswith(b" (glob)\n"): | ||||
| l = l[:-8] + b"\n" | l = l[:-8] + b"\n" | ||||
| return TTest.globmatch(el[:-8], l) or retry | return TTest.globmatch(el[:-8], l) or retry | ||||
| if os.altsep: | if os.altsep: | ||||
| _l = l.replace(b'\\', b'/') | _l = l.replace(b'\\', b'/') | ||||
| if el == _l or os.name == 'nt' and el[:-1] + b'\r\n' == _l: | if el == _l or os.name == 'nt' and el[:-1] + b'\r\n' == _l: | ||||
| return True | return True | ||||
| return retry | return retry | ||||
| @staticmethod | @staticmethod | ||||
| def parsehghaveoutput(lines): | def parsehghaveoutput(lines): | ||||
| '''Parse hghave log lines. | '''Parse hghave log lines. | ||||
| Return tuple of lists (missing, failed): | Return tuple of lists (missing, failed): | ||||
| * the missing/unknown features | * the missing/unknown features | ||||