Rev 5702: (jelmer) Require foreign branch formats to raise IncompatibleFormat when in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 5702 [merge]
revision-id: pqm at pqm.ubuntu.com-20110307153403-v1c3wgpajflxmejf
parent: pqm at pqm.ubuntu.com-20110307144146-xknzwbyjeaf9msr9
parent: jelmer at samba.org-20110306141811-8qzfq5zsoeijzolf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-03-07 15:34:03 +0000
message:
  (jelmer) Require foreign branch formats to raise IncompatibleFormat when
   creating in meta dir. (Jelmer Vernooij)
modified:
  bzrlib/tests/per_foreign_vcs/test_branch.py test_branch.py-20090804140930-7hsx6rgekjy0yzjx-1
=== modified file 'bzrlib/tests/per_foreign_vcs/test_branch.py'
--- a/bzrlib/tests/per_foreign_vcs/test_branch.py	2009-10-11 01:20:37 +0000
+++ b/bzrlib/tests/per_foreign_vcs/test_branch.py	2011-03-06 14:18:11 +0000
@@ -19,13 +19,13 @@
 
 
 from bzrlib.errors import (
+    IncompatibleFormat,
     UnstackableBranchFormat,
     )
 from bzrlib.revision import (
     NULL_REVISION,
     )
 from bzrlib.tests import (
-    TestCase,
     TestCaseWithTransport,
     )
 
@@ -129,7 +129,7 @@
         self.assertEquals((0, NULL_REVISION), branch.last_revision_info())
 
 
-class ForeignBranchFormatTests(TestCase):
+class ForeignBranchFormatTests(TestCaseWithTransport):
     """Basic tests for foreign branch format objects."""
 
     branch_format = None # Set to a BranchFormat instance by adapter
@@ -140,7 +140,8 @@
         Remote branches may be initializable on their own, but none currently
         support living in .bzr/branch.
         """
-        self.assertRaises(NotImplementedError, self.branch_format.initialize, None)
+        bzrdir = self.make_bzrdir('dir')
+        self.assertRaises(IncompatibleFormat, self.branch_format.initialize, bzrdir)
 
     def test_get_format_description_type(self):
         self.assertIsInstance(self.branch_format.get_format_description(), str)