← 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: Wouter van Heyst
  • Date: 2012-01-25 19:07:22 UTC
  • mfrom: (6437.19.2 2.5)
  • mto: (6437.3.27 2.5)
  • mto: This revision was merged to the branch mainline in revision 6451.
  • Revision ID: larstiq@larstiq.dyndns.org-20120125190722-1bf3j0d6my1zd8v1
ensure files actually hit the disk under pypy

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_checkout.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009-2012 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
21
from bzrlib import (
26
22
    branch as _mod_branch,
28
24
    errors,
29
25
    workingtree,
30
26
    )
31
 
from bzrlib.tests.blackbox import (
32
 
    ExternalBase,
33
 
    )
34
27
from bzrlib.tests import (
 
28
    TestCaseWithTransport,
 
29
    )
 
30
from bzrlib.tests.matchers import ContainsNoVfsCalls
 
31
from bzrlib.tests.features import (
35
32
    HardlinkFeature,
36
 
    KnownFailure,
37
33
    )
38
34
 
39
35
 
40
 
class TestCheckout(ExternalBase):
 
36
class TestCheckout(TestCaseWithTransport):
41
37
 
42
38
    def setUp(self):
43
39
        super(TestCheckout, self).setUp()
64
60
                         result.open_branch().bzrdir.root_transport.base)
65
61
 
66
62
    def test_checkout_dash_r(self):
67
 
        self.run_bzr('checkout -r -2 branch checkout')
 
63
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
68
64
        # the working tree should now be at revision '1' with the content
69
65
        # from 1.
70
66
        result = bzrdir.BzrDir.open('checkout')
71
67
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
72
 
        self.failIfExists('checkout/added_in_2')
 
68
        self.assertPathDoesNotExist('checkout/added_in_2')
73
69
 
74
70
    def test_checkout_light_dash_r(self):
75
 
        self.run_bzr('checkout --lightweight -r -2 branch checkout')
 
71
        out, err = self.run_bzr(['checkout','--lightweight', '-r', '-2',
 
72
            'branch', 'checkout'])
76
73
        # the working tree should now be at revision '1' with the content
77
74
        # from 1.
78
75
        result = bzrdir.BzrDir.open('checkout')
79
76
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
80
 
        self.failIfExists('checkout/added_in_2')
 
77
        self.assertPathDoesNotExist('checkout/added_in_2')
 
78
 
 
79
    def test_checkout_into_empty_dir(self):
 
80
        self.make_bzrdir('checkout')
 
81
        out, err = self.run_bzr(['checkout', 'branch', 'checkout'])
 
82
        result = bzrdir.BzrDir.open('checkout')
 
83
        tree = result.open_workingtree()
 
84
        branch = result.open_branch()
81
85
 
82
86
    def test_checkout_reconstitutes_working_trees(self):
83
87
        # doing a 'bzr checkout' in the directory of a branch with no tree
123
127
            cmd.append('--lightweight')
124
128
        self.run_bzr('checkout source target')
125
129
        # files with unique content should be moved
126
 
        self.failUnlessExists('target/file2.moved')
 
130
        self.assertPathExists('target/file2.moved')
127
131
        # files with content matching tree should not be moved
128
 
        self.failIfExists('target/file1.moved')
 
132
        self.assertPathDoesNotExist('target/file1.moved')
129
133
 
130
134
    def test_checkout_existing_dir_heavy(self):
131
135
        self._test_checkout_existing_dir(False)
136
140
    def test_checkout_in_branch_with_r(self):
137
141
        branch = _mod_branch.Branch.open('branch')
138
142
        branch.bzrdir.destroy_workingtree()
139
 
        os.chdir('branch')
140
 
        self.run_bzr('checkout -r 1')
141
 
        tree = workingtree.WorkingTree.open('.')
 
143
        self.run_bzr('checkout -r 1', working_dir='branch')
 
144
        tree = workingtree.WorkingTree.open('branch')
142
145
        self.assertEqual('1', tree.last_revision())
143
146
        branch.bzrdir.destroy_workingtree()
144
 
        self.run_bzr('checkout -r 0')
 
147
        self.run_bzr('checkout -r 0', working_dir='branch')
145
148
        self.assertEqual('null:', tree.last_revision())
146
149
 
147
150
    def test_checkout_files_from(self):
155
158
        self.build_tree(['source/file1'])
156
159
        source.add('file1')
157
160
        source.commit('added file')
158
 
        out, err = self.run_bzr(['checkout', 'source', 'target',
159
 
            '--files-from', 'source',
160
 
            '--hardlink'])
 
161
        out, err = self.run_bzr('checkout source target --hardlink')
161
162
        source_stat = os.stat('source/file1')
162
163
        target_stat = os.stat('target/file1')
163
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)
 
178
 
 
179
 
 
180
class TestSmartServerCheckout(TestCaseWithTransport):
 
181
 
 
182
    def test_heavyweight_checkout(self):
 
183
        self.setup_smart_server_with_call_log()
 
184
        t = self.make_branch_and_tree('from')
 
185
        for count in range(9):
 
186
            t.commit(message='commit %d' % count)
 
187
        self.reset_smart_call_log()
 
188
        out, err = self.run_bzr(['checkout', self.get_url('from'), 'target'])
 
189
        # This figure represent the amount of work to perform this use case. It
 
190
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
191
        # being too low. If rpc_count increases, more network roundtrips have
 
192
        # become necessary for this use case. Please do not adjust this number
 
193
        # upwards without agreement from bzr's network support maintainers.
 
194
        self.assertLength(10, self.hpss_calls)
 
195
        self.assertLength(1, self.hpss_connections)
 
196
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
197
 
 
198
    def test_lightweight_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', '--lightweight', self.get_url('from'),
 
205
            'target'])
 
206
        # This figure represent the amount of work to perform this use case. It
 
207
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
208
        # being too low. If rpc_count increases, more network roundtrips have
 
209
        # become necessary for this use case. Please do not adjust this number
 
210
        # upwards without agreement from bzr's network support maintainers.
 
211
        self.assertLength(15, self.hpss_calls)
 
212
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)