← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_pull.py

  • Committer: Matt Nordhoff
  • Date: 2009-06-23 05:12:07 UTC
  • mto: This revision was merged to the branch mainline in revision 4474.
  • Revision ID: mnordhoff@mattnordhoff.com-20090623051207-fksdtbzkwtnrw9dd
Update _add_text docstrings that still referred to add_text.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_pull.py
359
359
        self.assertContainsRe(out, r'\n {4}1 .*\n {6}setup\n')
360
360
        self.assertNotContainsRe(
361
361
            out, r'revno: 1\ncommitter: .*\nbranch nick: source')
362
 
 
363
 
    def test_pull_smart_stacked_streaming_acceptance(self):
364
 
        """'bzr pull -r 123' works on stacked, smart branches, even when the
365
 
        revision specified by the revno is only present in the fallback
366
 
        repository.
367
 
 
368
 
        See <https://launchpad.net/bugs/380314>
369
 
        """
370
 
        self.setup_smart_server_with_call_log()
371
 
        # Make a stacked-on branch with two commits so that the
372
 
        # revision-history can't be determined just by looking at the parent
373
 
        # field in the revision in the stacked repo.
374
 
        parent = self.make_branch_and_tree('parent', format='1.9')
375
 
        parent.commit(message='first commit')
376
 
        parent.commit(message='second commit')
377
 
        local = parent.bzrdir.sprout('local').open_workingtree()
378
 
        local.commit(message='local commit')
379
 
        local.branch.create_clone_on_transport(
380
 
            self.get_transport('stacked'), stacked_on=self.get_url('parent'))
381
 
        empty = self.make_branch_and_tree('empty', format='1.9')
382
 
        self.reset_smart_call_log()
383
 
        self.run_bzr(['pull', '-r', '1', self.get_url('stacked')],
384
 
            working_dir='empty')
385
 
        # This figure represent the amount of work to perform this use case. It
386
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
387
 
        # being too low. If rpc_count increases, more network roundtrips have
388
 
        # become necessary for this use case. Please do not adjust this number
389
 
        # upwards without agreement from bzr's network support maintainers.
390
 
        self.assertLength(18, self.hpss_calls)
391
 
        remote = Branch.open('stacked')
392
 
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
393