← 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: Vincent Ladeuil
  • Date: 2010-03-10 09:33:04 UTC
  • mto: (5082.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5083.
  • Revision ID: v.ladeuil+lp@free.fr-20100310093304-4245t4tazd4sxoav
Cleanup test from overly cautious checks.

Show diffs side-by-side

added added

removed removed

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