Rev 6259: (jelmer) Handle repository formats that don't support revision signatures in in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6259 [merge]
revision-id: pqm at pqm.ubuntu.com-20111114130331-8jhzuhxnrmcq2kzs
parent: pqm at pqm.ubuntu.com-20111114051937-k4iinxim500rk4ru
parent: jelmer at samba.org-20111113140738-tot1bmq155du3v0q
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-11-14 13:03:31 +0000
message:
  (jelmer) Handle repository formats that don't support revision signatures in
   the testsuite. (Jelmer Vernooij)
modified:
  bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/per_repository/test_signatures.py test_signatures.py-20111010140248-mdiotjn81vw9p7yb-1
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py	2011-10-19 14:23:07 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py	2011-11-13 14:07:38 +0000
@@ -322,6 +322,9 @@
         self.assertFalse(result.open_repository().make_working_trees())
 
     def test_upgrade_preserves_signatures(self):
+        if not self.repository_format.supports_revision_signatures:
+            raise tests.TestNotApplicable(
+                "repository does not support signing revisions")
         wt = self.make_branch_and_tree('source')
         wt.commit('A', allow_pointless=True, rev_id='A')
         repo = wt.branch.repository

=== modified file 'bzrlib/tests/per_repository/test_signatures.py'
--- a/bzrlib/tests/per_repository/test_signatures.py	2011-10-10 14:03:32 +0000
+++ b/bzrlib/tests/per_repository/test_signatures.py	2011-11-13 14:07:38 +0000
@@ -33,6 +33,12 @@
 #     an identical tree without a ghost
 # fetch missing should rewrite the TOC of weaves to list newly available parents.
 
+    def setUp(self):
+        super(TestSignatures, self).setUp()
+        if not self.repository_format.supports_revision_signatures:
+            raise tests.TestNotApplicable(
+                "repository does not support signing revisions")
+
     def test_sign_existing_revision(self):
         wt = self.make_branch_and_tree('.')
         wt.commit("base", allow_pointless=True, rev_id='A')
@@ -93,3 +99,19 @@
         d2 = repo.bzrdir.clone(urlutils.local_path_to_url('target'))
         self.assertEqual(repo.get_signature_text('A'),
                          d2.open_repository().get_signature_text('A'))
+
+
+class TestUnsupportedSignatures(per_repository.TestCaseWithRepository):
+
+    def test_sign_revision(self):
+        if self.repository_format.supports_revision_signatures:
+            raise tests.TestNotApplicable(
+                "repository supports signing revisions")
+        wt = self.make_branch_and_tree('source')
+        wt.commit('A', allow_pointless=True, rev_id='A')
+        repo = wt.branch.repository
+        repo.lock_write()
+        repo.start_write_group()
+        self.assertRaises(errors.UnsupportedOperation,
+            repo.sign_revision, 'A', gpg.LoopbackGPGStrategy(None))
+        repo.commit_write_group()