~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_checkout.py

MergeĀ lp:~gz/bzr/path_from_environ_832028

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
21
from bzrlib import (
26
22
    branch as _mod_branch,
31
27
from bzrlib.tests import (
32
28
    TestCaseWithTransport,
33
29
    )
34
 
from bzrlib.tests import (
 
30
from bzrlib.tests.features import (
35
31
    HardlinkFeature,
36
 
    KnownFailure,
37
32
    )
38
33
 
39
34
 
69
64
        # from 1.
70
65
        result = bzrdir.BzrDir.open('checkout')
71
66
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
72
 
        self.failIfExists('checkout/added_in_2')
 
67
        self.assertPathDoesNotExist('checkout/added_in_2')
73
68
 
74
69
    def test_checkout_light_dash_r(self):
75
70
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
78
73
        # from 1.
79
74
        result = bzrdir.BzrDir.open('checkout')
80
75
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
81
 
        self.failIfExists('checkout/added_in_2')
 
76
        self.assertPathDoesNotExist('checkout/added_in_2')
82
77
 
83
78
    def test_checkout_reconstitutes_working_trees(self):
84
79
        # doing a 'bzr checkout' in the directory of a branch with no tree
124
119
            cmd.append('--lightweight')
125
120
        self.run_bzr('checkout source target')
126
121
        # files with unique content should be moved
127
 
        self.failUnlessExists('target/file2.moved')
 
122
        self.assertPathExists('target/file2.moved')
128
123
        # files with content matching tree should not be moved
129
 
        self.failIfExists('target/file1.moved')
 
124
        self.assertPathDoesNotExist('target/file1.moved')
130
125
 
131
126
    def test_checkout_existing_dir_heavy(self):
132
127
        self._test_checkout_existing_dir(False)
173
168
        second_stat = os.stat('second/file1')
174
169
        target_stat = os.stat('target/file1')
175
170
        self.assertEqual(second_stat, target_stat)
 
171
 
 
172
 
 
173
class TestSmartServerCheckout(TestCaseWithTransport):
 
174
 
 
175
    def test_heavyweight_checkout(self):
 
176
        self.setup_smart_server_with_call_log()
 
177
        t = self.make_branch_and_tree('from')
 
178
        for count in range(9):
 
179
            t.commit(message='commit %d' % count)
 
180
        self.reset_smart_call_log()
 
181
        out, err = self.run_bzr(['checkout', self.get_url('from'),
 
182
            'target'])
 
183
        # This figure represent the amount of work to perform this use case. It
 
184
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
185
        # being too low. If rpc_count increases, more network roundtrips have
 
186
        # become necessary for this use case. Please do not adjust this number
 
187
        # upwards without agreement from bzr's network support maintainers.
 
188
        self.assertLength(17, self.hpss_calls)
 
189
 
 
190
    def test_lightweight_checkout(self):
 
191
        self.setup_smart_server_with_call_log()
 
192
        t = self.make_branch_and_tree('from')
 
193
        for count in range(9):
 
194
            t.commit(message='commit %d' % count)
 
195
        self.reset_smart_call_log()
 
196
        out, err = self.run_bzr(['checkout', '--lightweight', self.get_url('from'),
 
197
            'target'])
 
198
        # This figure represent the amount of work to perform this use case. It
 
199
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
200
        # being too low. If rpc_count increases, more network roundtrips have
 
201
        # become necessary for this use case. Please do not adjust this number
 
202
        # upwards without agreement from bzr's network support maintainers.
 
203
        if len(self.hpss_calls) < 34 or len(self.hpss_calls) > 48:
 
204
            self.fail(
 
205
                "Incorrect length: wanted between 34 and 48, got %d for %r" % (
 
206
                    len(self.hpss_calls), self.hpss_calls))