← 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

(jameinel) Allow 'bzr serve' to interpret SIGHUP as a graceful shutdown.
 (bug #795025) (John A Meinel)

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