Mercurial > public > mercurial-scm > hg

diff tests/run-tests.py @ 42512:84aff7e20c55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 21 Jun 2019 23:35:04 -0700
parents ae3f862cbb3d c1850798f995
children 49998d5ba66a
line wrap: on
line diff
--- a/tests/run-tests.py	Wed Jun 19 10:19:32 2019 -0700
+++ b/tests/run-tests.py	Fri Jun 21 23:35:04 2019 -0700
@@ -1748,7 +1748,8 @@
 
                 el = m.group(1) + b"\n"
                 if not self._iftest(conditions):
-                    retry = "retry"    # Not required by listed features
+                    # listed feature missing, should not match
+                    return "retry", False
 
         if el.endswith(b" (esc)\n"):
             if PYTHON3: