← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/bzrdir_implementations/test_bzrdir.py

Commit final test-case-cleanups branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
904
904
            return
905
905
        self.assertRaises(errors.NoRepositoryPresent, dir.open_repository)
906
906
        tree = self.createWorkingTreeOrSkip(dir)
907
 
        tree.bzrdir.root_transport.mkdir('subdir')
 
907
        self.build_tree(['source/subdir/'])
908
908
        tree.add('subdir')
909
909
        target = self.sproutOrSkip(dir, self.get_url('target'))
910
910
        self.assertNotEqual(dir.transport.base, target.transport.base)
930
930
            return
931
931
        self.assertRaises(errors.NoRepositoryPresent, dir.open_repository)
932
932
        tree = self.createWorkingTreeOrSkip(dir)
933
 
        self.build_tree(['foo'], transport=dir.root_transport)
 
933
        self.build_tree(['source/foo'])
934
934
        tree.add('foo')
935
935
        tree.commit('revision 1', rev_id='1')
936
936
        tree.commit('revision 2', rev_id='2', allow_pointless=True)
953
953
        # This smoke test just checks the revision-id is right. Tree specific
954
954
        # tests will check corner cases.
955
955
        tree = self.make_branch_and_tree('source')
956
 
        self.build_tree(['foo'], transport=tree.bzrdir.root_transport)
 
956
        self.build_tree(['source/foo'])
957
957
        tree.add('foo')
958
958
        tree.commit('revision 1', rev_id='1')
959
959
        tree.commit('revision 2', rev_id='2', allow_pointless=True)
964
964
    def test_sprout_bzrdir_incomplete_source_with_basis(self):
965
965
        # ensure that basis really does grab from the basis by having incomplete source
966
966
        tree = self.make_branch_and_tree('commit_tree')
967
 
        self.build_tree(['foo'], transport=tree.bzrdir.root_transport)
 
967
        self.build_tree(['commit_tree/foo'])
968
968
        tree.add('foo')
969
969
        tree.commit('revision 1', rev_id='1')
970
970
        source = self.make_branch_and_tree('source')