Rev 3541: (mbp) weaves over hpss is not a test failure in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3541
revision-id:pqm at pqm.ubuntu.com-20080716013256-ws10ogzi9ya941vk
parent: pqm at pqm.ubuntu.com-20080716004557-pz9w4p88pc5ebr7l
parent: mbp at sourcefrog.net-20080715050613-yz1ya3ygvqwezp03
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-07-16 02:32:56 +0100
message:
  (mbp) weaves over hpss is not a test failure
modified:
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
    ------------------------------------------------------------
    revno: 3537.2.1
    revision-id:mbp at sourcefrog.net-20080715050613-yz1ya3ygvqwezp03
    parent: pqm at pqm.ubuntu.com-20080714082119-ju6qe5weo8pp7f1c
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: fetch-weaves-not-supported
    timestamp: Tue 2008-07-15 15:06:13 +1000
    message:
      weaves-over-hpss is just not supported, rather than an expected failure
    modified:
      bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
      doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py	2008-06-12 02:31:52 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py	2008-07-15 05:06:13 +0000
@@ -688,7 +688,7 @@
     def test_sprout_from_hpss_preserves_format(self):
         """repo.sprout from a smart server preserves the repository format."""
         if self.repository_format == RepositoryFormat7():
-            raise KnownFailure(
+            raise TestNotApplicable(
                 "Cannot fetch weaves over smart protocol.")
         remote_repo = self.make_remote_repository('remote')
         local_bzrdir = self.make_bzrdir('local')
@@ -707,7 +707,7 @@
         weave_formats = [RepositoryFormat5(), RepositoryFormat6(),
                          RepositoryFormat7()]
         if self.repository_format in weave_formats:
-            raise KnownFailure(
+            raise TestNotApplicable(
                 "Cannot fetch weaves over smart protocol.")
         remote_repo = self.make_remote_repository('remote')
         remote_branch = remote_repo.bzrdir.create_branch()

=== modified file 'doc/developers/HACKING.txt'
--- a/doc/developers/HACKING.txt	2008-06-11 02:18:46 +0000
+++ b/doc/developers/HACKING.txt	2008-07-15 05:06:13 +0000
@@ -475,6 +475,10 @@
         expected to fail.  This could be conditionally raised if something
         is broken on some platforms but not on others.
 
+        If the test would fail because of something we don't expect or
+        intend to fix, KnownFailure is not appropriate, and
+        TestNotApplicable might be better. 
+
 We plan to support three modes for running the test suite to control the
 interpretation of these results.  Strict mode is for use in situations
 like merges to the mainline and releases where we want to make sure that