← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-12 15:51:57 UTC
  • mfrom: (1551.15.20 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070612155157-j1juioefu5w946ph
Skip intermittently failing test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_branch.py
167
167
        br_b = branch.clone(repo_b.bzrdir, revision_id='1')
168
168
        self.assertEqual('1', br_b.last_revision())
169
169
 
 
170
    def test_sprout_partial(self):
 
171
        # test sprouting with a prefix of the revision-history.
 
172
        # also needs not-on-revision-history behaviour defined.
 
173
        wt_a = self.make_branch_and_tree('a')
 
174
        self.build_tree(['a/one'])
 
175
        wt_a.add(['one'])
 
176
        wt_a.commit('commit one', rev_id='1')
 
177
        self.build_tree(['a/two'])
 
178
        wt_a.add(['two'])
 
179
        wt_a.commit('commit two', rev_id='2')
 
180
        repo_b = self.make_repository('b')
 
181
        repo_a = wt_a.branch.repository
 
182
        repo_a.copy_content_into(repo_b)
 
183
        br_b = wt_a.branch.sprout(repo_b.bzrdir, revision_id='1')
 
184
        self.assertEqual('1', br_b.last_revision())
 
185
 
170
186
    def get_parented_branch(self):
171
187
        wt_a = self.make_branch_and_tree('a')
172
188
        self.build_tree(['a/one'])
198
214
        branch_d = branch_b.clone(repo_d.bzrdir)
199
215
        self.assertEqual(random_parent, branch_d.get_parent())
200
216
 
 
217
    def test_sprout_branch_nickname(self):
 
218
        # test the nick name is reset always
 
219
        raise TestSkipped('XXX branch sprouting is not yet tested..')
 
220
 
 
221
    def test_sprout_branch_parent(self):
 
222
        source = self.make_branch('source')
 
223
        target = source.bzrdir.sprout(self.get_url('target')).open_branch()
 
224
        self.assertEqual(source.bzrdir.root_transport.base, target.get_parent())
 
225
 
201
226
    def test_submit_branch(self):
202
227
        """Submit location can be queried and set"""
203
228
        branch = self.make_branch('branch')