changeset 15346:53f37b24f26a stable

tests: check for svn >= 1.3 and >= 1.5 in tests that require those versions
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 23 Oct 2011 21:22:55 +0200
parents 6e3c560f2fd1
children 799e56609ef6
files tests/hghave tests/test-convert-svn-sink.t tests/test-mq-subrepo-svn.t tests/test-subrepo-svn.t
diffstat 4 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/hghave	Sat Oct 22 23:42:48 2011 +0200
+++ b/tests/hghave	Sun Oct 23 21:22:55 2011 +0200
@@ -140,6 +140,9 @@
 def has_svn15():
     return getsvnversion() >= (1, 5)
 
+def has_svn13():
+    return getsvnversion() >= (1, 3)
+
 def has_svn():
     return matchoutput('svn --version 2>&1', r'^svn, version') and \
         matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
@@ -230,6 +233,7 @@
     "pygments": (has_pygments, "Pygments source highlighting library"),
     "ssl": (has_ssl, "python >= 2.6 ssl module and python OpenSSL"),
     "svn": (has_svn, "subversion client and admin tools"),
+    "svn13": (has_svn13, "subversion client and admin tools >= 1.3"),
     "svn15": (has_svn15, "subversion client and admin tools >= 1.5"),
     "svn-bindings": (has_svn_bindings, "subversion python bindings"),
     "symlink": (has_symlink, "symbolic links"),
--- a/tests/test-convert-svn-sink.t	Sat Oct 22 23:42:48 2011 +0200
+++ b/tests/test-convert-svn-sink.t	Sun Oct 23 21:22:55 2011 +0200
@@ -1,5 +1,5 @@
 
-  $ "$TESTDIR/hghave" svn no-outer-repo || exit 80
+  $ "$TESTDIR/hghave" svn13 no-outer-repo || exit 80
 
   $ fixpath()
   > {
--- a/tests/test-mq-subrepo-svn.t	Sat Oct 22 23:42:48 2011 +0200
+++ b/tests/test-mq-subrepo-svn.t	Sun Oct 23 21:22:55 2011 +0200
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" svn || exit 80
+  $ "$TESTDIR/hghave" svn13 || exit 80
 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
--- a/tests/test-subrepo-svn.t	Sat Oct 22 23:42:48 2011 +0200
+++ b/tests/test-subrepo-svn.t	Sun Oct 23 21:22:55 2011 +0200
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" svn || exit 80
+  $ "$TESTDIR/hghave" svn15 || exit 80
 
   $ fix_path()
   > {