← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-03-11 04:33:41 UTC
  • mfrom: (4797.33.4 2.1)
  • mto: This revision was merged to the branch mainline in revision 5082.
  • Revision ID: andrew.bennetts@canonical.com-20100311043341-rzdik83fnactjsxs
Merge lp:bzr/2.1, including fixes for #496813, #526211, #526353.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_checkout.py
28
28
    errors,
29
29
    workingtree,
30
30
    )
31
 
from bzrlib.tests import (
32
 
    TestCaseWithTransport,
 
31
from bzrlib.tests.blackbox import (
 
32
    ExternalBase,
33
33
    )
34
34
from bzrlib.tests import (
35
35
    HardlinkFeature,
37
37
    )
38
38
 
39
39
 
40
 
class TestCheckout(TestCaseWithTransport):
 
40
class TestCheckout(ExternalBase):
41
41
 
42
42
    def setUp(self):
43
43
        super(TestCheckout, self).setUp()
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'])
 
67
        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')
71
71
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
72
 
        self.assertPathDoesNotExist('checkout/added_in_2')
 
72
        self.failIfExists('checkout/added_in_2')
73
73
 
74
74
    def test_checkout_light_dash_r(self):
75
 
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
76
 
            'branch', 'checkout'])
 
75
        self.run_bzr('checkout --lightweight -r -2 branch checkout')
77
76
        # the working tree should now be at revision '1' with the content
78
77
        # from 1.
79
78
        result = bzrdir.BzrDir.open('checkout')
80
79
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
81
 
        self.assertPathDoesNotExist('checkout/added_in_2')
 
80
        self.failIfExists('checkout/added_in_2')
82
81
 
83
82
    def test_checkout_reconstitutes_working_trees(self):
84
83
        # doing a 'bzr checkout' in the directory of a branch with no tree
124
123
            cmd.append('--lightweight')
125
124
        self.run_bzr('checkout source target')
126
125
        # files with unique content should be moved
127
 
        self.assertPathExists('target/file2.moved')
 
126
        self.failUnlessExists('target/file2.moved')
128
127
        # files with content matching tree should not be moved
129
 
        self.assertPathDoesNotExist('target/file1.moved')
 
128
        self.failIfExists('target/file1.moved')
130
129
 
131
130
    def test_checkout_existing_dir_heavy(self):
132
131
        self._test_checkout_existing_dir(False)
156
155
        self.build_tree(['source/file1'])
157
156
        source.add('file1')
158
157
        source.commit('added file')
159
 
        out, err = self.run_bzr('checkout source target --hardlink')
 
158
        out, err = self.run_bzr(['checkout', 'source', 'target',
 
159
            '--files-from', 'source',
 
160
            '--hardlink'])
160
161
        source_stat = os.stat('source/file1')
161
162
        target_stat = os.stat('target/file1')
162
163
        self.assertEqual(source_stat, target_stat)
163
 
 
164
 
    def test_checkout_hardlink_files_from(self):
165
 
        self.requireFeature(HardlinkFeature)
166
 
        source = self.make_branch_and_tree('source')
167
 
        self.build_tree(['source/file1'])
168
 
        source.add('file1')
169
 
        source.commit('added file')
170
 
        source.bzrdir.sprout('second')
171
 
        out, err = self.run_bzr('checkout source target --hardlink'
172
 
                                ' --files-from second')
173
 
        second_stat = os.stat('second/file1')
174
 
        target_stat = os.stat('target/file1')
175
 
        self.assertEqual(second_stat, target_stat)