/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: Martin
  • Date: 2011-05-21 16:43:19 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521164319-5ua6aoazejsvef0w
Avoid implicit str casting in trace methods by calling unicode() on conflict objects first

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.blackbox import (
32
 
    ExternalBase,
 
31
from bzrlib.tests import (
 
32
    TestCaseWithTransport,
33
33
    )
34
34
from bzrlib.tests import (
35
35
    HardlinkFeature,
37
37
    )
38
38
 
39
39
 
40
 
class TestCheckout(ExternalBase):
 
40
class TestCheckout(TestCaseWithTransport):
41
41
 
42
42
    def setUp(self):
43
43
        super(TestCheckout, self).setUp()
65
65
 
66
66
    def test_checkout_dash_r(self):
67
67
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
68
 
        self.assertContainsRe(out, 'Copying history to "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')
72
71
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
73
 
        self.failIfExists('checkout/added_in_2')
 
72
        self.assertPathDoesNotExist('checkout/added_in_2')
74
73
 
75
74
    def test_checkout_light_dash_r(self):
76
75
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
77
76
            'branch', 'checkout'])
78
 
        self.assertNotContainsRe(out, 'Copying history')
79
77
        # the working tree should now be at revision '1' with the content
80
78
        # from 1.
81
79
        result = bzrdir.BzrDir.open('checkout')
82
80
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
83
 
        self.failIfExists('checkout/added_in_2')
 
81
        self.assertPathDoesNotExist('checkout/added_in_2')
84
82
 
85
83
    def test_checkout_reconstitutes_working_trees(self):
86
84
        # doing a 'bzr checkout' in the directory of a branch with no tree
126
124
            cmd.append('--lightweight')
127
125
        self.run_bzr('checkout source target')
128
126
        # files with unique content should be moved
129
 
        self.failUnlessExists('target/file2.moved')
 
127
        self.assertPathExists('target/file2.moved')
130
128
        # files with content matching tree should not be moved
131
 
        self.failIfExists('target/file1.moved')
 
129
        self.assertPathDoesNotExist('target/file1.moved')
132
130
 
133
131
    def test_checkout_existing_dir_heavy(self):
134
132
        self._test_checkout_existing_dir(False)
158
156
        self.build_tree(['source/file1'])
159
157
        source.add('file1')
160
158
        source.commit('added file')
161
 
        out, err = self.run_bzr(['checkout', 'source', 'target',
162
 
            '--files-from', 'source',
163
 
            '--hardlink'])
 
159
        out, err = self.run_bzr('checkout source target --hardlink')
164
160
        source_stat = os.stat('source/file1')
165
161
        target_stat = os.stat('target/file1')
166
162
        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)