← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.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_bzrdir.py
38
38
    transport as _mod_transport,
39
39
    urlutils,
40
40
    win32utils,
41
 
    workingtree_3,
42
 
    workingtree_4,
 
41
    workingtree,
43
42
    )
44
43
import bzrlib.branch
45
44
from bzrlib.errors import (
808
807
        branch = self.make_branch('branch', format='knit')
809
808
        format = branch.bzrdir.cloning_metadir()
810
809
        self.assertIsInstance(format.workingtree_format,
811
 
            workingtree_4.WorkingTreeFormat6)
 
810
            workingtree.WorkingTreeFormat3)
812
811
 
813
812
    def test_sprout_recursive_treeless(self):
814
813
        tree = self.make_branch_and_tree('tree1',
964
963
        checkout_base = t.clone('checkout').base
965
964
        self.assertEqual(checkout_base, dir.get_workingtree_transport(None).base)
966
965
        self.assertEqual(checkout_base,
967
 
                         dir.get_workingtree_transport(workingtree_3.WorkingTreeFormat3()).base)
 
966
                         dir.get_workingtree_transport(workingtree.WorkingTreeFormat3()).base)
968
967
 
969
968
    def test_meta1dir_uses_lockdir(self):
970
969
        """Meta1 format uses a LockDir to guard the whole directory, not a file."""
1058
1057
        my_bzrdir = bzrdir.BzrDir.open(self.get_url('branch-knit2'))
1059
1058
        checkout_format = my_bzrdir.checkout_metadir()
1060
1059
        self.assertIsInstance(checkout_format.workingtree_format,
1061
 
                              workingtree_4.WorkingTreeFormat4)
 
1060
                              workingtree.WorkingTreeFormat3)
1062
1061
 
1063
1062
 
1064
1063
class TestHTTPRedirections(object):