← 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: 2016-01-21 17:48:07 UTC
  • mto: This revision was merged to the branch mainline in revision 6613.
  • Revision ID: v.ladeuil+lp@free.fr-20160121174807-g4ybpaij9ln5wj6a
https://launchpad.net/bugs/106898
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.

There was a mix of AssertionError or UnicodeEncodeError.

Also deleted test_put_file_unicode() which was bogus, files contain bytes not unicode strings.

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,
27
23
    bzrdir,
 
24
    controldir,
28
25
    errors,
29
26
    workingtree,
30
27
    )
31
28
from bzrlib.tests import (
32
29
    TestCaseWithTransport,
33
30
    )
34
 
from bzrlib.tests import (
 
31
from bzrlib.tests.matchers import ContainsNoVfsCalls
 
32
from bzrlib.tests.features import (
35
33
    HardlinkFeature,
36
 
    KnownFailure,
37
34
    )
38
35
 
39
36
 
41
38
 
42
39
    def setUp(self):
43
40
        super(TestCheckout, self).setUp()
44
 
        tree = bzrdir.BzrDir.create_standalone_workingtree('branch')
 
41
        tree = controldir.ControlDir.create_standalone_workingtree('branch')
45
42
        tree.commit('1', rev_id='1', allow_pointless=True)
46
43
        self.build_tree(['branch/added_in_2'])
47
44
        tree.add('added_in_2')
50
47
    def test_checkout_makes_bound_branch(self):
51
48
        self.run_bzr('checkout branch checkout')
52
49
        # if we have a checkout, the branch base should be 'branch'
53
 
        source = bzrdir.BzrDir.open('branch')
54
 
        result = bzrdir.BzrDir.open('checkout')
 
50
        source = controldir.ControlDir.open('branch')
 
51
        result = controldir.ControlDir.open('checkout')
55
52
        self.assertEqual(source.open_branch().bzrdir.root_transport.base,
56
53
                         result.open_branch().get_bound_location())
57
54
 
58
55
    def test_checkout_light_makes_checkout(self):
59
56
        self.run_bzr('checkout --lightweight branch checkout')
60
57
        # if we have a checkout, the branch base should be 'branch'
61
 
        source = bzrdir.BzrDir.open('branch')
62
 
        result = bzrdir.BzrDir.open('checkout')
 
58
        source = controldir.ControlDir.open('branch')
 
59
        result = controldir.ControlDir.open('checkout')
63
60
        self.assertEqual(source.open_branch().bzrdir.root_transport.base,
64
61
                         result.open_branch().bzrdir.root_transport.base)
65
62
 
67
64
        out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
68
65
        # the working tree should now be at revision '1' with the content
69
66
        # from 1.
70
 
        result = bzrdir.BzrDir.open('checkout')
 
67
        result = controldir.ControlDir.open('checkout')
71
68
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
72
69
        self.assertPathDoesNotExist('checkout/added_in_2')
73
70
 
76
73
            'branch', 'checkout'])
77
74
        # the working tree should now be at revision '1' with the content
78
75
        # from 1.
79
 
        result = bzrdir.BzrDir.open('checkout')
 
76
        result = controldir.ControlDir.open('checkout')
80
77
        self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
81
78
        self.assertPathDoesNotExist('checkout/added_in_2')
82
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()
 
86
 
83
87
    def test_checkout_reconstitutes_working_trees(self):
84
88
        # doing a 'bzr checkout' in the directory of a branch with no tree
85
89
        # or a 'bzr checkout path' with path the name of a directory with
86
90
        # a branch with no tree will reconsistute the tree.
87
91
        os.mkdir('treeless-branch')
88
 
        branch = bzrdir.BzrDir.create_branch_convenience(
 
92
        branch = controldir.ControlDir.create_branch_convenience(
89
93
            'treeless-branch',
90
94
            force_new_tree=False,
91
95
            format=bzrdir.BzrDirMetaFormat1())
98
102
        out, err = self.run_bzr('diff treeless-branch')
99
103
 
100
104
        # now test with no parameters
101
 
        branch = bzrdir.BzrDir.create_branch_convenience(
 
105
        branch = controldir.ControlDir.create_branch_convenience(
102
106
            '.',
103
107
            force_new_tree=False,
104
108
            format=bzrdir.BzrDirMetaFormat1())
137
141
    def test_checkout_in_branch_with_r(self):
138
142
        branch = _mod_branch.Branch.open('branch')
139
143
        branch.bzrdir.destroy_workingtree()
140
 
        os.chdir('branch')
141
 
        self.run_bzr('checkout -r 1')
142
 
        tree = workingtree.WorkingTree.open('.')
 
144
        self.run_bzr('checkout -r 1', working_dir='branch')
 
145
        tree = workingtree.WorkingTree.open('branch')
143
146
        self.assertEqual('1', tree.last_revision())
144
147
        branch.bzrdir.destroy_workingtree()
145
 
        self.run_bzr('checkout -r 0')
 
148
        self.run_bzr('checkout -r 0', working_dir='branch')
146
149
        self.assertEqual('null:', tree.last_revision())
147
150
 
148
151
    def test_checkout_files_from(self):
173
176
        second_stat = os.stat('second/file1')
174
177
        target_stat = os.stat('target/file1')
175
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.assertEquals(
 
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)