← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jonathan Riddell
  • Date: 2011-09-16 15:37:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6146.
  • Revision ID: jriddell@canonical.com-20110916153758-y936k3hysjc1tphy
update tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
334
334
        # mainline.
335
335
        out, err = self.run_bzr(['branch', 'branch', 'newbranch'])
336
336
        self.assertEqual('', out)
337
 
        self.assertEqual('Branched 2 revision(s).\n',
 
337
        self.assertEqual('Branched 2 revisions.\n',
338
338
            err)
339
339
        # it should have preserved the branch format, and so it should be
340
340
        # capable of supporting stacking, but not actually have a stacked_on
441
441
        # being too low. If rpc_count increases, more network roundtrips have
442
442
        # become necessary for this use case. Please do not adjust this number
443
443
        # upwards without agreement from bzr's network support maintainers.
444
 
        self.assertLength(37, self.hpss_calls)
 
444
        self.assertLength(39, self.hpss_calls)
445
445
 
446
446
    def test_branch_from_trivial_branch_streaming_acceptance(self):
447
447
        self.setup_smart_server_with_call_log()
561
561
                $ bzr checkout %(option)s repo/trunk checkout
562
562
                $ cd checkout
563
563
                $ bzr branch --switch ../repo/trunk ../repo/branched
564
 
                2>Branched 0 revision(s).
 
564
                2>Branched 0 revisions.
565
565
                2>Tree is up to date at revision 0.
566
566
                2>Switched to branch:...branched...
567
567
                $ cd ..