← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-23 23:26:35 UTC
  • mto: This revision was merged to the branch mainline in revision 6486.
  • Revision ID: jelmer@samba.org-20120223232635-opp7nq6ly9562x36
Use controldir rather than bzrdir in a couple more places.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
1944
1944
    def test_make_branch_and_tree_with_format(self):
1945
1945
        # we should be able to supply a format to make_branch_and_tree
1946
1946
        self.make_branch_and_tree('a', format=bzrlib.bzrdir.BzrDirMetaFormat1())
1947
 
        self.assertIsInstance(bzrlib.bzrdir.BzrDir.open('a')._format,
 
1947
        self.assertIsInstance(bzrlib.controldir.ControlDir.open('a')._format,
1948
1948
                              bzrlib.bzrdir.BzrDirMetaFormat1)
1949
1949
 
1950
1950
    def test_make_branch_and_memory_tree(self):