/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 breezy/tests/blackbox/test_checkout.py

  • Committer: Jelmer Vernooij
  • Date: 2018-08-26 02:01:46 UTC
  • mto: This revision was merged to the branch mainline in revision 7087.
  • Revision ID: jelmer@jelmer.uk-20180826020146-owq7fxsr6ermorlh
Fix remaining warnings on Python 3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_checkout.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009-2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""Tests for the 'checkout' CLI command."""
18
18
 
19
 
from cStringIO import StringIO
20
19
import os
21
 
import re
22
 
import shutil
23
 
import sys
24
20
 
25
 
from bzrlib import (
 
21
from breezy import (
26
22
    branch as _mod_branch,
27
 
    bzrdir,
 
23
    controldir,
28
24
    errors,
29
25
    workingtree,
30
26
    )
31
 
from bzrlib.tests.blackbox import (
32
 
    ExternalBase,
33
 
    )
34
 
from bzrlib.tests import (
 
27
from breezy.bzr import (
 
28
    bzrdir,
 
29
    )
 
30
from breezy.tests import (
 
31
    TestCaseWithTransport,
 
32
    )
 
33
from breezy.tests.matchers import ContainsNoVfsCalls
 
34
from breezy.tests.features import (
35
35
    HardlinkFeature,
36
 
    KnownFailure,
37
36
    )
38
37
 
39
38
 
40
 
class TestCheckout(ExternalBase):
 
39
class TestCheckout(TestCaseWithTransport):
41
40
 
42
41
    def setUp(self):
43
42
        super(TestCheckout, self).setUp()
44
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('branch')
45
 
        tree.commit('1', rev_id='1', allow_pointless=True)
 
43
        tree = controldir.ControlDir.create_standalone_workingtree('branch')
 
44
        tree.commit('1', rev_id=b'1', allow_pointless=True)
46
45
        self.build_tree(['branch/added_in_2'])
47
46
        tree.add('added_in_2')
48
 
        tree.commit('2', rev_id='2')
 
47
        tree.commit('2', rev_id=b'2')
49
48
 
50
49
    def test_checkout_makes_bound_branch(self):
51
50
        self.run_bzr('checkout branch checkout')
52
51
        # if we have a checkout, the branch base should be 'branch'
53
 
        source = bzrdir.BzrDir.open('branch')
54
 
        result = bzrdir.BzrDir.open('checkout')
55
 
        self.assertEqual(source.open_branch().bzrdir.root_transport.base,
 
52
        source = controldir.ControlDir.open('branch')
 
53
        result = controldir.ControlDir.open('checkout')
 
54
        self.assertEqual(source.open_branch().controldir.root_transport.base,
56
55
                         result.open_branch().get_bound_location())
57
56
 
58
57
    def test_checkout_light_makes_checkout(self):
59
58
        self.run_bzr('checkout --lightweight branch checkout')
60
59
        # if we have a checkout, the branch base should be 'branch'
61
 
        source = bzrdir.BzrDir.open('branch')
62
 
        result = bzrdir.BzrDir.open('checkout')
63
 
        self.assertEqual(source.open_branch().bzrdir.root_transport.base,
64
 
                         result.open_branch().bzrdir.root_transport.base)
 
60
        source = controldir.ControlDir.open('branch')
 
61
        result = controldir.ControlDir.open('checkout')
 
62
        self.assertEqual(source.open_branch().controldir.root_transport.base,
 
63
                         result.open_branch().controldir.root_transport.base)
65
64
 
66
65
    def test_checkout_dash_r(self):
67
 
        self.run_bzr('checkout -r -2 branch checkout')
 
66
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
68
67
        # the working tree should now be at revision '1' with the content
69
68
        # from 1.
70
 
        result = bzrdir.BzrDir.open('checkout')
71
 
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
72
 
        self.failIfExists('checkout/added_in_2')
 
69
        result = controldir.ControlDir.open('checkout')
 
70
        self.assertEqual([b'1'], result.open_workingtree().get_parent_ids())
 
71
        self.assertPathDoesNotExist('checkout/added_in_2')
73
72
 
74
73
    def test_checkout_light_dash_r(self):
75
 
        self.run_bzr('checkout --lightweight -r -2 branch checkout')
 
74
        out, err = self.run_bzr(['checkout', '--lightweight', '-r', '-2',
 
75
            'branch', 'checkout'])
76
76
        # the working tree should now be at revision '1' with the content
77
77
        # from 1.
78
 
        result = bzrdir.BzrDir.open('checkout')
79
 
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
80
 
        self.failIfExists('checkout/added_in_2')
 
78
        result = controldir.ControlDir.open('checkout')
 
79
        self.assertEqual([b'1'], result.open_workingtree().get_parent_ids())
 
80
        self.assertPathDoesNotExist('checkout/added_in_2')
 
81
 
 
82
    def test_checkout_into_empty_dir(self):
 
83
        self.make_controldir('checkout')
 
84
        out, err = self.run_bzr(['checkout', 'branch', 'checkout'])
 
85
        result = controldir.ControlDir.open('checkout')
 
86
        tree = result.open_workingtree()
 
87
        branch = result.open_branch()
81
88
 
82
89
    def test_checkout_reconstitutes_working_trees(self):
83
 
        # doing a 'bzr checkout' in the directory of a branch with no tree
84
 
        # or a 'bzr checkout path' with path the name of a directory with
 
90
        # doing a 'brz checkout' in the directory of a branch with no tree
 
91
        # or a 'brz checkout path' with path the name of a directory with
85
92
        # a branch with no tree will reconsistute the tree.
86
93
        os.mkdir('treeless-branch')
87
 
        branch = bzrdir.BzrDir.create_branch_convenience(
 
94
        branch = controldir.ControlDir.create_branch_convenience(
88
95
            'treeless-branch',
89
96
            force_new_tree=False,
90
97
            format=bzrdir.BzrDirMetaFormat1())
91
98
        # check no tree was created
92
 
        self.assertRaises(errors.NoWorkingTree, branch.bzrdir.open_workingtree)
 
99
        self.assertRaises(errors.NoWorkingTree, branch.controldir.open_workingtree)
93
100
        out, err = self.run_bzr('checkout treeless-branch')
94
101
        # we should have a tree now
95
 
        branch.bzrdir.open_workingtree()
 
102
        branch.controldir.open_workingtree()
96
103
        # with no diff
97
104
        out, err = self.run_bzr('diff treeless-branch')
98
105
 
99
106
        # now test with no parameters
100
 
        branch = bzrdir.BzrDir.create_branch_convenience(
 
107
        branch = controldir.ControlDir.create_branch_convenience(
101
108
            '.',
102
109
            force_new_tree=False,
103
110
            format=bzrdir.BzrDirMetaFormat1())
104
111
        # check no tree was created
105
 
        self.assertRaises(errors.NoWorkingTree, branch.bzrdir.open_workingtree)
 
112
        self.assertRaises(errors.NoWorkingTree, branch.controldir.open_workingtree)
106
113
        out, err = self.run_bzr('checkout')
107
114
        # we should have a tree now
108
 
        branch.bzrdir.open_workingtree()
 
115
        branch.controldir.open_workingtree()
109
116
        # with no diff
110
117
        out, err = self.run_bzr('diff')
111
118
 
112
119
    def _test_checkout_existing_dir(self, lightweight):
113
120
        source = self.make_branch_and_tree('source')
114
 
        self.build_tree_contents([('source/file1', 'content1'),
115
 
                                  ('source/file2', 'content2'),])
 
121
        self.build_tree_contents([('source/file1', b'content1'),
 
122
                                  ('source/file2', b'content2'),])
116
123
        source.add(['file1', 'file2'])
117
124
        source.commit('added files')
118
 
        self.build_tree_contents([('target/', ''),
119
 
                                  ('target/file1', 'content1'),
120
 
                                  ('target/file2', 'content3'),])
 
125
        self.build_tree_contents([('target/', b''),
 
126
                                  ('target/file1', b'content1'),
 
127
                                  ('target/file2', b'content3'),])
121
128
        cmd = ['checkout', 'source', 'target']
122
129
        if lightweight:
123
130
            cmd.append('--lightweight')
124
131
        self.run_bzr('checkout source target')
125
132
        # files with unique content should be moved
126
 
        self.failUnlessExists('target/file2.moved')
 
133
        self.assertPathExists('target/file2.moved')
127
134
        # files with content matching tree should not be moved
128
 
        self.failIfExists('target/file1.moved')
 
135
        self.assertPathDoesNotExist('target/file1.moved')
129
136
 
130
137
    def test_checkout_existing_dir_heavy(self):
131
138
        self._test_checkout_existing_dir(False)
135
142
 
136
143
    def test_checkout_in_branch_with_r(self):
137
144
        branch = _mod_branch.Branch.open('branch')
138
 
        branch.bzrdir.destroy_workingtree()
139
 
        os.chdir('branch')
140
 
        self.run_bzr('checkout -r 1')
141
 
        tree = workingtree.WorkingTree.open('.')
142
 
        self.assertEqual('1', tree.last_revision())
143
 
        branch.bzrdir.destroy_workingtree()
144
 
        self.run_bzr('checkout -r 0')
145
 
        self.assertEqual('null:', tree.last_revision())
 
145
        branch.controldir.destroy_workingtree()
 
146
        self.run_bzr('checkout -r 1', working_dir='branch')
 
147
        tree = workingtree.WorkingTree.open('branch')
 
148
        self.assertEqual(b'1', tree.last_revision())
 
149
        branch.controldir.destroy_workingtree()
 
150
        self.run_bzr('checkout -r 0', working_dir='branch')
 
151
        self.assertEqual(b'null:', tree.last_revision())
146
152
 
147
153
    def test_checkout_files_from(self):
148
154
        branch = _mod_branch.Branch.open('branch')
155
161
        self.build_tree(['source/file1'])
156
162
        source.add('file1')
157
163
        source.commit('added file')
158
 
        out, err = self.run_bzr(['checkout', 'source', 'target',
159
 
            '--files-from', 'source',
160
 
            '--hardlink'])
 
164
        out, err = self.run_bzr('checkout source target --hardlink')
161
165
        source_stat = os.stat('source/file1')
162
166
        target_stat = os.stat('target/file1')
163
167
        self.assertEqual(source_stat, target_stat)
 
168
 
 
169
    def test_checkout_hardlink_files_from(self):
 
170
        self.requireFeature(HardlinkFeature)
 
171
        source = self.make_branch_and_tree('source')
 
172
        self.build_tree(['source/file1'])
 
173
        source.add('file1')
 
174
        source.commit('added file')
 
175
        source.controldir.sprout('second')
 
176
        out, err = self.run_bzr('checkout source target --hardlink'
 
177
                                ' --files-from second')
 
178
        second_stat = os.stat('second/file1')
 
179
        target_stat = os.stat('target/file1')
 
180
        self.assertEqual(second_stat, target_stat)
 
181
 
 
182
    def test_colo_checkout(self):
 
183
        source = self.make_branch_and_tree('source', format='development-colo')
 
184
        self.build_tree(['source/file1'])
 
185
        source.add('file1')
 
186
        source.commit('added file')
 
187
        target = source.controldir.sprout('file:second,branch=somebranch',
 
188
            create_tree_if_local=False)
 
189
        out, err = self.run_bzr('checkout file:,branch=somebranch .',
 
190
            working_dir='second')
 
191
        # We should always be creating a lighweight checkout for colocated
 
192
        # branches.
 
193
        self.assertEqual(
 
194
            target.open_branch(name='somebranch').user_url,
 
195
            target.get_branch_reference(name=""))
 
196
 
 
197
 
 
198
class TestSmartServerCheckout(TestCaseWithTransport):
 
199
 
 
200
    def test_heavyweight_checkout(self):
 
201
        self.setup_smart_server_with_call_log()
 
202
        t = self.make_branch_and_tree('from')
 
203
        for count in range(9):
 
204
            t.commit(message='commit %d' % count)
 
205
        self.reset_smart_call_log()
 
206
        out, err = self.run_bzr(['checkout', self.get_url('from'), 'target'])
 
207
        # This figure represent the amount of work to perform this use case. It
 
208
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
209
        # being too low. If rpc_count increases, more network roundtrips have
 
210
        # become necessary for this use case. Please do not adjust this number
 
211
        # upwards without agreement from bzr's network support maintainers.
 
212
        self.assertLength(10, self.hpss_calls)
 
213
        self.assertLength(1, self.hpss_connections)
 
214
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
215
 
 
216
    def test_lightweight_checkout(self):
 
217
        self.setup_smart_server_with_call_log()
 
218
        t = self.make_branch_and_tree('from')
 
219
        for count in range(9):
 
220
            t.commit(message='commit %d' % count)
 
221
        self.reset_smart_call_log()
 
222
        out, err = self.run_bzr(['checkout', '--lightweight', self.get_url('from'),
 
223
            'target'])
 
224
        # This figure represent the amount of work to perform this use case. It
 
225
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
226
        # being too low. If rpc_count increases, more network roundtrips have
 
227
        # become necessary for this use case. Please do not adjust this number
 
228
        # upwards without agreement from bzr's network support maintainers.
 
229
        self.assertLength(13, self.hpss_calls)
 
230
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)