← 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: Robert Collins
  • Date: 2010-06-28 02:41:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100628024122-g951fzp74f3u6wst
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_checkout.py
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
75
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
78
78
        # from 1.
79
79
        result = bzrdir.BzrDir.open('checkout')
80
80
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
81
 
        self.assertPathDoesNotExist('checkout/added_in_2')
 
81
        self.failIfExists('checkout/added_in_2')
82
82
 
83
83
    def test_checkout_reconstitutes_working_trees(self):
84
84
        # doing a 'bzr checkout' in the directory of a branch with no tree
124
124
            cmd.append('--lightweight')
125
125
        self.run_bzr('checkout source target')
126
126
        # files with unique content should be moved
127
 
        self.assertPathExists('target/file2.moved')
 
127
        self.failUnlessExists('target/file2.moved')
128
128
        # files with content matching tree should not be moved
129
 
        self.assertPathDoesNotExist('target/file1.moved')
 
129
        self.failIfExists('target/file1.moved')
130
130
 
131
131
    def test_checkout_existing_dir_heavy(self):
132
132
        self._test_checkout_existing_dir(False)
156
156
        self.build_tree(['source/file1'])
157
157
        source.add('file1')
158
158
        source.commit('added file')
159
 
        out, err = self.run_bzr('checkout source target --hardlink')
 
159
        out, err = self.run_bzr(['checkout', 'source', 'target',
 
160
            '--files-from', 'source',
 
161
            '--hardlink'])
160
162
        source_stat = os.stat('source/file1')
161
163
        target_stat = os.stat('target/file1')
162
164
        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)