Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 10 Oct 2012 11:31:01 +0200
changeset 1137 2d9daef1e473
parent 1134 183d7e3d7ce8 (current diff)
parent 1136 294cea906d3a (diff)
child 1140 689f8b6b711c
Merge with stable
--- a/tests/hghave.py	Wed Sep 19 00:59:23 2012 +0100
+++ b/tests/hghave.py	Wed Oct 10 11:31:01 2012 +0200
@@ -152,7 +152,7 @@
         return False
 
 def getsvnversion():
-    m = matchoutput('svn --version 2>&1', r'^svn,\s+version\s+(\d+)\.(\d+)')
+    m = matchoutput('svn --version --quiet 2>&1', r'^(\d+)\.(\d+)')
     if not m:
         return (0, 0)
     return (int(m.group(1)), int(m.group(2)))
--- a/tests/run-tests.py	Wed Sep 19 00:59:23 2012 +0100
+++ b/tests/run-tests.py	Wed Oct 10 11:31:01 2012 +0200
@@ -684,7 +684,7 @@
     pos = -1
     postout = []
     ret = 0
-    for n, l in enumerate(output):
+    for l in output:
         lout, lcmd = l, None
         if salt in l:
             lout, lcmd = l.split(salt, 1)