Mercurial > hg > mercurial-crew

diff tests/run-tests.py @ 11781:6f59154fb604

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: catch re.error if test line is not a valid regular expression
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Thu, 12 Aug 2010 14:53:34 +0900
parents 431e2bf37ae7
children 4134686b83e1
line wrap: on
line diff
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -499,6 +499,13 @@
     finally:
         os.remove(name)
 
+    def rematch(el, l):
+        try:
+            return re.match(el, l)
+        except re.error:
+            # el is an invalid regex
+            return False
+
     pos = -1
     postout = []
     for n, l in enumerate(output):
@@ -513,7 +520,7 @@
 
             if el == l: # perfect match (fast)
                 postout.append("  " + l)
-            elif el and re.match(el, l): # fallback regex match
+            elif el and rematch(el, l): # fallback regex match
                 postout.append("  " + el)
             else: # mismatch - let diff deal with it
                 postout.append("  " + l)