← 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: Patch Queue Manager
  • Date: 2011-10-09 13:52:06 UTC
  • mfrom: (6202.1.3 revno-revision)
  • Revision ID: pqm@pqm.ubuntu.com-20111009135206-t3utsln6mtzv9eut
(jelmer) Add a --revision argument to 'bzr revno'. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
29
29
from bzrlib.tests import TestCaseWithTransport
30
30
from bzrlib.tests import (
31
31
    fixtures,
32
 
    HardlinkFeature,
33
32
    script,
34
33
    test_server,
35
34
    )
 
35
from bzrlib.tests.features import (
 
36
    HardlinkFeature,
 
37
    )
36
38
from bzrlib.tests.blackbox import test_switch
37
39
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
38
40
from bzrlib.tests.script import run_script
342
344
        # mainline.
343
345
        out, err = self.run_bzr(['branch', 'branch', 'newbranch'])
344
346
        self.assertEqual('', out)
345
 
        self.assertEqual('Branched 2 revision(s).\n',
 
347
        self.assertEqual('Branched 2 revisions.\n',
346
348
            err)
347
349
        # it should have preserved the branch format, and so it should be
348
350
        # capable of supporting stacking, but not actually have a stacked_on
449
451
        # being too low. If rpc_count increases, more network roundtrips have
450
452
        # become necessary for this use case. Please do not adjust this number
451
453
        # upwards without agreement from bzr's network support maintainers.
452
 
        self.assertLength(37, self.hpss_calls)
 
454
        self.assertLength(39, self.hpss_calls)
453
455
 
454
456
    def test_branch_from_trivial_branch_streaming_acceptance(self):
455
457
        self.setup_smart_server_with_call_log()
569
571
                $ bzr checkout %(option)s repo/trunk checkout
570
572
                $ cd checkout
571
573
                $ bzr branch --switch ../repo/trunk ../repo/branched
572
 
                2>Branched 0 revision(s).
 
574
                2>Branched 0 revisions.
573
575
                2>Tree is up to date at revision 0.
574
576
                2>Switched to branch:...branched...
575
577
                $ cd ..