← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

(jelmer) Skip tests that require an inventory when run against a WorkingTree
 that is not inventory based. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
22
22
    symbol_versioning,
23
23
    transport,
24
24
    workingtree,
25
 
    workingtree_3,
26
 
    workingtree_4,
27
25
    )
28
26
from bzrlib.lockdir import LockDir
29
27
from bzrlib.mutabletree import needs_tree_write_lock
64
62
 
65
63
    def test_get_set_default_format(self):
66
64
        old_format = workingtree.format_registry.get_default()
67
 
        # default is 6
68
 
        self.assertTrue(isinstance(old_format, workingtree_4.WorkingTreeFormat6))
 
65
        # default is 3
 
66
        self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
69
67
        workingtree.format_registry.set_default(SampleTreeFormat())
70
68
        try:
71
69
            # the default branch format is used by the meta dir format
81
79
 
82
80
    def test_get_set_default_format_by_key(self):
83
81
        old_format = workingtree.format_registry.get_default()
84
 
        # default is 6
 
82
        # default is 3
85
83
        format = SampleTreeFormat()
86
84
        workingtree.format_registry.register(format)
87
85
        self.addCleanup(workingtree.format_registry.remove, format)
88
 
        self.assertTrue(isinstance(old_format, workingtree_4.WorkingTreeFormat6))
 
86
        self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
89
87
        workingtree.format_registry.set_default_key(format.get_format_string())
90
88
        try:
91
89
            # the default branch format is used by the meta dir format
193
191
            t = transport.get_transport(url)
194
192
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
195
193
            self.assertIsInstance(found_format, format.__class__)
196
 
        check_format(workingtree_3.WorkingTreeFormat3(), "bar")
 
194
        check_format(workingtree.WorkingTreeFormat3(), "bar")
197
195
 
198
196
    def test_find_format_no_tree(self):
199
197
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
277
275
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
278
276
        control.create_repository()
279
277
        control.create_branch()
280
 
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
 
278
        tree = workingtree.WorkingTreeFormat3().initialize(control)
281
279
        # we want:
282
280
        # format 'Bazaar-NG Working Tree format 3'
283
281
        # inventory = blank inventory
311
309
        repo = dir.create_repository()
312
310
        branch = dir.create_branch()
313
311
        try:
314
 
            tree = workingtree_3.WorkingTreeFormat3().initialize(dir)
 
312
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
315
313
        except errors.NotLocalUrl:
316
314
            raise TestSkipped('Not a local URL')
317
315
        self.assertIsDirectory('.bzr', t)
328
326
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
329
327
        control.create_repository()
330
328
        control.create_branch()
331
 
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
 
329
        tree = workingtree.WorkingTreeFormat3().initialize(control)
332
330
        tree._transport.delete("pending-merges")
333
331
        self.assertEqual([], tree.get_parent_ids())
334
332