← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-06 15:15:44 UTC
  • mfrom: (5835 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110506151544-atzxeezfwssnlacr
Merge bzr.dev 5835 in prep for release-notes updates

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