From e98156ddbd8cc16243d2ad1cde922b282619084f Mon Sep 17 00:00:00 2001
From: glasser <glasser@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a>
Date: Wed, 9 Apr 2008 00:00:39 +0000
Subject: [PATCH] Skip a test when run against old servers.

* subversion/tests/cmdline/commit_tests.py
  (test_list): Skip start_commit_detect_capabilities unless the server
   actually pays attention to capabilities.

* subversion/tests/cmdline/svntest/main.py
  (server_gets_client_capabilities): New.


git-svn-id: http://svn.collab.net/repos/svn/trunk@30439 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
---
 subversion/tests/cmdline/commit_tests.py | 6 ++++--
 subversion/tests/cmdline/svntest/main.py | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/subversion/tests/cmdline/commit_tests.py b/subversion/tests/cmdline/commit_tests.py
index 6e9ccd84b..d5b966801 100755
--- a/subversion/tests/cmdline/commit_tests.py
+++ b/subversion/tests/cmdline/commit_tests.py
@@ -28,7 +28,8 @@ SkipUnless = svntest.testcase.SkipUnless
 XFail = svntest.testcase.XFail
 Item = svntest.wc.StateItem
 
-from svntest.main import server_has_revprop_commit
+from svntest.main import server_has_revprop_commit, \
+    server_gets_client_capabilities
 from svntest.actions import inject_conflict_into_wc
 
 ######################################################################
@@ -2549,7 +2550,8 @@ test_list = [ None,
               versioned_log_message,
               changelist_near_conflict,
               commit_out_of_date_file,
-              start_commit_detect_capabilities,
+              SkipUnless(start_commit_detect_capabilities,
+                         server_gets_client_capabilities),
               commit_url,
              ]
 
diff --git a/subversion/tests/cmdline/svntest/main.py b/subversion/tests/cmdline/svntest/main.py
index 096f8807d..f14424336 100644
--- a/subversion/tests/cmdline/svntest/main.py
+++ b/subversion/tests/cmdline/svntest/main.py
@@ -850,6 +850,10 @@ def server_authz_has_aliases():
   _check_command_line_parsed()
   return server_minor_version >= 5
 
+def server_gets_client_capabilities():
+  _check_command_line_parsed()
+  return server_minor_version >= 5
+
 
 ######################################################################
 # Sandbox handling
-- 
2.11.4.GIT