/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: Robert Collins
  • Date: 2010-05-11 08:36:16 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511083616-b8fjb19zomwupid0
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.

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
 
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
68
 
        self.assertContainsRe(out, 'Copying history to "checkout".')
 
67
        self.run_bzr('checkout -r -2 branch checkout')
69
68
        # the working tree should now be at revision '1' with the content
70
69
        # from 1.
71
70
        result = bzrdir.BzrDir.open('checkout')
73
72
        self.failIfExists('checkout/added_in_2')
74
73
 
75
74
    def test_checkout_light_dash_r(self):
76
 
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
77
 
            'branch', 'checkout'])
78
 
        self.assertNotContainsRe(out, 'Copying history')
 
75
        self.run_bzr('checkout --lightweight -r -2 branch checkout')
79
76
        # the working tree should now be at revision '1' with the content
80
77
        # from 1.
81
78
        result = bzrdir.BzrDir.open('checkout')