changeset 6384:8bc876e03143

Skip older monotone versions for tests. test-convert-mtn is known to work with 0.37 and 0.38, but fails with 0.31 (Debian etch). hghave now skips all versions up to 0.31.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 24 Mar 2008 22:49:33 +0100
parents 38485d45f947
children 0d4e068e9e52
files tests/hghave
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/hghave	Mon Mar 24 22:09:01 2008 +0100
+++ b/tests/hghave	Mon Mar 24 22:49:33 2008 +0100
@@ -31,10 +31,11 @@
     return matchoutput('cvsps -h -q 2>&1', r'cvsps version', True)
 
 def has_darcs():
-    return matchoutput('darcs', 'darcs version', True)
+    return matchoutput('darcs', r'darcs version', True)
 
 def has_mtn():
-    return matchoutput('mtn --version', 'monotone', True)
+    return matchoutput('mtn --version', r'monotone', True) and not matchoutput(
+        'mtn --version', r'monotone 0\.(\d|[12]\d|3[01])[^\d]', True)
 
 def has_eol_in_paths():
     try:
@@ -128,7 +129,7 @@
     "git": (has_git, "git command line client"),
     "hotshot": (has_hotshot, "python hotshot module"),
     "lsprof": (has_lsprof, "python lsprof module"),
-    "mtn": (has_mtn, "monotone client"),
+    "mtn": (has_mtn, "monotone client (> 0.31)"),
     "svn": (has_svn, "subversion client and admin tools"),
     "svn-bindings": (has_svn_bindings, "subversion python bindings"),
     "symlink": (has_symlink, "symbolic links"),