Rev 2249: Allow disabling capabilities for testing purposes. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2249
revision-id: jelmer at samba.org-20081208195423-xswdw72i0lzobq4o
parent: jelmer at samba.org-20081208191332-8ru2dk8gvec14jvz
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Mon 2008-12-08 20:54:23 +0100
message:
  Allow disabling capabilities for testing purposes.
modified:
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'repository.py'
--- a/repository.py	2008-12-08 17:45:54 +0000
+++ b/repository.py	2008-12-08 19:54:23 +0000
@@ -307,7 +307,7 @@
         if supports_custom_revprops and mapping.can_use_revprops:
             return (True, mapping.must_use_fileprops)
         else:
-            return (mapping.can_use_fileprops, False)
+            return (False, mapping.can_use_fileprops)
 
     def get_mapping(self):
         """Get the default mapping that is used for this repository."""

=== modified file 'tests/test_push.py'
--- a/tests/test_push.py	2008-12-08 18:08:01 +0000
+++ b/tests/test_push.py	2008-12-08 19:54:23 +0000
@@ -28,7 +28,7 @@
 
 import os
 
-from bzrlib.plugins.svn import format
+from bzrlib.plugins.svn import format, transport
 from bzrlib.plugins.svn.errors import MissingPrefix
 from bzrlib.plugins.svn.commit import push, dpush
 from bzrlib.plugins.svn.layout.standard import RootLayout
@@ -40,6 +40,7 @@
 class TestDPush(SubversionTestCase):
     def setUp(self):
         super(TestDPush, self).setUp()
+        transport.disabled_capabilities.update(["commit-revprops", "log-revprops"])
         self.repos_url = self.make_repository('d')
 
         dc = self.commit_editor()
@@ -51,6 +52,10 @@
         os.mkdir("dc")
         self.bzrdir = self.svndir.sprout("dc")
 
+
+    def tearDown(self):
+        transport.disabled_capabilities = set()
+
     def commit_editor(self):
         return self.get_commit_editor(self.repos_url)
 

=== modified file 'transport.py'
--- a/transport.py	2008-12-08 19:13:32 +0000
+++ b/transport.py	2008-12-08 19:54:23 +0000
@@ -44,6 +44,8 @@
 
 svn_config = get_config()
 
+disabled_capabilities = set()
+
 
 # Don't run any tests on SvnTransport as it is not intended to be 
 # a full implementation of Transport
@@ -415,6 +417,8 @@
             self.add_connection(conn)
 
     def has_capability(self, cap):
+        if cap in disabled_capabilities:
+            return False
         if cap in self.capabilities:
             return self.capabilities[cap]
         conn = self.get_connection()