← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.py

  • Committer: Patch Queue Manager
  • Date: 2012-09-05 20:52:26 UTC
  • mfrom: (6549.3.1 dev_2.5_integration)
  • Revision ID: pqm@pqm.ubuntu.com-20120905205226-8s3bzolvduug3ifj
(gz) Merge 2.5 (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
211
211
                        new_ie = ie.copy()
212
212
                        new_ie.revision = None
213
213
                        builder.record_entry_contents(new_ie, 
214
 
                            [parent_tree.inventory],
 
214
                            [parent_tree.root_inventory],
215
215
                            path, tree, 
216
216
                            (ie.kind, ie.text_size, ie.executable, ie.text_sha1))
217
217
                    builder.finish_inventory()
330
330
 
331
331
    def cloning_metadir(self, stacked=False):
332
332
        """Produce a metadir suitable for cloning with."""
333
 
        return bzrdir.format_registry.make_bzrdir("default")
 
333
        return controldir.format_registry.make_bzrdir("default")
334
334
 
335
335
    def checkout_metadir(self):
336
336
        return self.cloning_metadir()
446
446
    def test_create(self):
447
447
        """Test we can create dummies."""
448
448
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
449
 
        dir = bzrdir.BzrDir.open("d")
 
449
        dir = controldir.ControlDir.open("d")
450
450
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
451
451
        dir.open_repository()
452
452
        dir.open_branch()
455
455
    def test_sprout(self):
456
456
        """Test we can clone dummies and that the format is not preserved."""
457
457
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
458
 
        dir = bzrdir.BzrDir.open("d")
 
458
        dir = controldir.ControlDir.open("d")
459
459
        newdir = dir.sprout("e")
460
460
        self.assertNotEquals("A Dummy VCS Dir",
461
461
                             newdir._format.get_format_string())