/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-06-04 05:59:55 UTC
  • mfrom: (5279.1.1 lazy-import-merge)
  • Revision ID: pqm@pqm.ubuntu.com-20100604055955-98pfcy1bn8oz7749
(spiv) Use lazy imports in bzrilb.merge to minimise the startup cost of
 plugins like news_merge. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_checkout.py
64
64
                         result.open_branch().bzrdir.root_transport.base)
65
65
 
66
66
    def test_checkout_dash_r(self):
67
 
        self.run_bzr('checkout -r -2 branch checkout')
 
67
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
68
68
        # the working tree should now be at revision '1' with the content
69
69
        # from 1.
70
70
        result = bzrdir.BzrDir.open('checkout')
72
72
        self.failIfExists('checkout/added_in_2')
73
73
 
74
74
    def test_checkout_light_dash_r(self):
75
 
        self.run_bzr('checkout --lightweight -r -2 branch checkout')
 
75
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
 
76
            'branch', 'checkout'])
76
77
        # the working tree should now be at revision '1' with the content
77
78
        # from 1.
78
79
        result = bzrdir.BzrDir.open('checkout')