Rev 5670: (jelmer) Remove dependencies on weave formats in bzrlib.tests.test_bzrdir. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Feb 19 13:16:03 UTC 2011
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5670 [merge]
revision-id: pqm at pqm.ubuntu.com-20110219131601-15lmpis5kt0npz1b
parent: pqm at pqm.ubuntu.com-20110218201649-woj0pygeukoq6z6h
parent: jelmer at samba.org-20110219123804-6fwa0m7sv24iv2eb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2011-02-19 13:16:01 +0000
message:
(jelmer) Remove dependencies on weave formats in bzrlib.tests.test_bzrdir.
(Jelmer Vernooij)
modified:
bzrlib/controldir.py controldir.py-20100802102926-hvtvh0uae5epuibp-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
=== modified file 'bzrlib/controldir.py'
--- a/bzrlib/controldir.py 2011-02-16 15:52:12 +0000
+++ b/bzrlib/controldir.py 2011-02-19 00:33:36 +0000
@@ -669,6 +669,8 @@
"""
supports_workingtrees = True
+ """Whether working trees can exist in control directories of this format.
+ """
def get_format_description(self):
"""Return the short description for this format."""
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2011-02-10 15:13:32 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2011-02-19 12:38:04 +0000
@@ -41,11 +41,12 @@
workingtree,
)
import bzrlib.branch
-from bzrlib.errors import (NotBranchError,
- NoColocatedBranchSupport,
- UnknownFormatError,
- UnsupportedFormatError,
- )
+from bzrlib.errors import (
+ NotBranchError,
+ NoColocatedBranchSupport,
+ UnknownFormatError,
+ UnsupportedFormatError,
+ )
from bzrlib.tests import (
TestCase,
TestCaseWithMemoryTransport,
@@ -64,14 +65,14 @@
from bzrlib.transport.http._urllib import HttpTransport_urllib
from bzrlib.transport.nosmart import NoSmartTransportDecorator
from bzrlib.transport.readonly import ReadonlyTransportDecorator
-from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
+from bzrlib.repofmt import knitrepo, pack_repo
class TestDefaultFormat(TestCase):
def test_get_set_default_format(self):
old_format = bzrdir.BzrDirFormat.get_default_format()
- # default is BzrDirFormat6
+ # default is BzrDirMetaFormat1
self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1))
controldir.ControlDirFormat._set_default_format(SampleBzrDirFormat())
# creating a bzr dir should now create an instrumented dir.
@@ -83,15 +84,20 @@
self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
+class DeprecatedBzrDirFormat(bzrdir.BzrDirFormat):
+ """A deprecated bzr dir format."""
+
+
class TestFormatRegistry(TestCase):
def make_format_registry(self):
my_format_registry = controldir.ControlDirFormatRegistry()
- my_format_registry.register('weave', bzrdir.BzrDirFormat6,
- 'Pre-0.8 format. Slower and does not support checkouts or shared'
- ' repositories', deprecated=True)
- my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir',
- 'BzrDirFormat6', 'Format registered lazily', deprecated=True)
+ my_format_registry.register('deprecated', DeprecatedBzrDirFormat,
+ 'Some format. Slower and unawesome and deprecated.',
+ deprecated=True)
+ my_format_registry.register_lazy('lazy', 'bzrlib.tests.test_bzrdir',
+ 'DeprecatedBzrDirFormat', 'Format registered lazily',
+ deprecated=True)
bzrdir.register_metadir(my_format_registry, 'knit',
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
'Format using knits',
@@ -108,20 +114,19 @@
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
'Experimental successor to knit. Use at your own risk.',
branch_format='bzrlib.branch.BzrBranchFormat6', hidden=True)
- my_format_registry.register('hiddenweave', bzrdir.BzrDirFormat6,
- 'Pre-0.8 format. Slower and does not support checkouts or shared'
- ' repositories', hidden=True)
- my_format_registry.register_lazy('hiddenlazy', 'bzrlib.bzrdir',
- 'BzrDirFormat6', 'Format registered lazily', deprecated=True,
- hidden=True)
+ my_format_registry.register('hiddendeprecated', DeprecatedBzrDirFormat,
+ 'Old format. Slower and does not support things. ', hidden=True)
+ my_format_registry.register_lazy('hiddenlazy', 'bzrlib.tests.test_bzrdir',
+ 'DeprecatedBzrDirFormat', 'Format registered lazily',
+ deprecated=True, hidden=True)
return my_format_registry
def test_format_registry(self):
my_format_registry = self.make_format_registry()
my_bzrdir = my_format_registry.make_bzrdir('lazy')
- self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
- my_bzrdir = my_format_registry.make_bzrdir('weave')
- self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
+ self.assertIsInstance(my_bzrdir, DeprecatedBzrDirFormat)
+ my_bzrdir = my_format_registry.make_bzrdir('deprecated')
+ self.assertIsInstance(my_bzrdir, DeprecatedBzrDirFormat)
my_bzrdir = my_format_registry.make_bzrdir('default')
self.assertIsInstance(my_bzrdir.repository_format,
knitrepo.RepositoryFormatKnit1)
@@ -140,9 +145,8 @@
my_format_registry.get_help('knit'))
self.assertEqual('Format using knits',
my_format_registry.get_help('default'))
- self.assertEqual('Pre-0.8 format. Slower and does not support'
- ' checkouts or shared repositories',
- my_format_registry.get_help('weave'))
+ self.assertEqual('Some format. Slower and unawesome and deprecated.',
+ my_format_registry.get_help('deprecated'))
def test_help_topic(self):
topics = help_topics.HelpTopicRegistry()
@@ -179,13 +183,13 @@
def test_aliases(self):
a_registry = controldir.ControlDirFormatRegistry()
- a_registry.register('weave', bzrdir.BzrDirFormat6,
- 'Pre-0.8 format. Slower and does not support checkouts or shared'
- ' repositories', deprecated=True)
- a_registry.register('weavealias', bzrdir.BzrDirFormat6,
- 'Pre-0.8 format. Slower and does not support checkouts or shared'
- ' repositories', deprecated=True, alias=True)
- self.assertEqual(frozenset(['weavealias']), a_registry.aliases())
+ a_registry.register('deprecated', DeprecatedBzrDirFormat,
+ 'Old format. Slower and does not support stuff',
+ deprecated=True)
+ a_registry.register('deprecatedalias', DeprecatedBzrDirFormat,
+ 'Old format. Slower and does not support stuff',
+ deprecated=True, alias=True)
+ self.assertEqual(frozenset(['deprecatedalias']), a_registry.aliases())
class SampleBranch(bzrlib.branch.Branch):
@@ -248,13 +252,30 @@
return "opened branch."
+class BzrDirFormatTest1(bzrdir.BzrDirMetaFormat1):
+
+ @staticmethod
+ def get_format_string():
+ return "Test format 1"
+
+
+class BzrDirFormatTest2(bzrdir.BzrDirMetaFormat1):
+
+ @staticmethod
+ def get_format_string():
+ return "Test format 2"
+
+
class TestBzrDirFormat(TestCaseWithTransport):
"""Tests for the BzrDirFormat facility."""
def test_find_format(self):
# is the right format object found for a branch?
# create a branch with a few known format objects.
- # this is not quite the same as
+ bzrdir.BzrDirFormat.register_format(BzrDirFormatTest1())
+ self.addCleanup(bzrdir.BzrDirFormat.unregister_format, BzrDirFormatTest1())
+ bzrdir.BzrDirFormat.register_format(BzrDirFormatTest2())
+ self.addCleanup(bzrdir.BzrDirFormat.unregister_format, BzrDirFormatTest2())
t = self.get_transport()
self.build_tree(["foo/", "bar/"], transport=t)
def check_format(format, url):
@@ -262,8 +283,8 @@
t = _mod_transport.get_transport(url)
found_format = bzrdir.BzrDirFormat.find_format(t)
self.failUnless(isinstance(found_format, format.__class__))
- check_format(bzrdir.BzrDirFormat5(), "foo")
- check_format(bzrdir.BzrDirFormat6(), "bar")
+ check_format(BzrDirFormatTest1(), "foo")
+ check_format(BzrDirFormatTest2(), "bar")
def test_find_format_nothing_there(self):
self.assertRaises(NotBranchError,
@@ -932,8 +953,9 @@
dir.get_branch_transport(bzrlib.branch.BzrBranchFormat5()).base)
repository_base = t.clone('repository').base
self.assertEqual(repository_base, dir.get_repository_transport(None).base)
+ repository_format = repository.format_registry.get_default()
self.assertEqual(repository_base,
- dir.get_repository_transport(weaverepo.RepositoryFormat7()).base)
+ dir.get_repository_transport(repository_format).base)
checkout_base = t.clone('checkout').base
self.assertEqual(checkout_base, dir.get_workingtree_transport(None).base)
self.assertEqual(checkout_base,
More information about the bazaar-commits
mailing list