/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 bzrlib/tests/blackbox/test_switch.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-31 17:42:29 UTC
  • mto: This revision was merged to the branch mainline in revision 4611.
  • Revision ID: john@arbash-meinel.com-20090731174229-w2zdsdlfpeddk8gl
Now we got to the per-workingtree tests, etc.

The main causes seem to break down into:
  bzrdir.clone() is known to be broken wrt locking, this effects
  everything that tries to 'push'

  shelf code is not compatible with strict locking

  merge code seems to have an issue. This might actually be the
  root cause of the clone() problems.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_switch.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007, 2008, 2009 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
20
20
 
21
21
import os
22
22
 
23
 
from bzrlib import osutils
24
23
from bzrlib.workingtree import WorkingTree
25
24
from bzrlib.tests.blackbox import ExternalBase
26
 
from bzrlib.directory_service import directories
27
25
 
28
26
 
29
27
class TestSwitch(ExternalBase):
30
28
 
31
 
    def _create_sample_tree(self):
32
 
        tree = self.make_branch_and_tree('branch-1')
33
 
        self.build_tree(['branch-1/file-1', 'branch-1/file-2'])
34
 
        tree.add('file-1')
35
 
        tree.commit('rev1')
36
 
        tree.add('file-2')
37
 
        tree.commit('rev2')
38
 
        return tree
39
 
 
40
29
    def test_switch_up_to_date_light_checkout(self):
41
30
        self.make_branch_and_tree('branch')
42
31
        self.run_bzr('branch branch branch2')
145
134
        self.assertEqual(branchb_id, checkout.last_revision())
146
135
        self.assertEqual(tree2.branch.base, checkout.branch.get_bound_location())
147
136
 
148
 
    def test_switch_revision(self):
149
 
        tree = self._create_sample_tree()
150
 
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
151
 
        self.run_bzr(['switch', 'branch-1', '-r1'], working_dir='checkout')
152
 
        self.failUnlessExists('checkout/file-1')
153
 
        self.failIfExists('checkout/file-2')
154
 
 
155
 
    def test_switch_only_revision(self):
156
 
        tree = self._create_sample_tree()
157
 
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
158
 
        self.failUnlessExists('checkout/file-1')
159
 
        self.failUnlessExists('checkout/file-2')
160
 
        self.run_bzr(['switch', '-r1'], working_dir='checkout')
161
 
        self.failUnlessExists('checkout/file-1')
162
 
        self.failIfExists('checkout/file-2')
163
 
        # Check that we don't accept a range
164
 
        self.run_bzr_error(
165
 
            ['bzr switch --revision takes exactly one revision identifier'],
166
 
            ['switch', '-r0..2'], working_dir='checkout')
167
 
 
168
137
    def prepare_lightweight_switch(self):
169
138
        branch = self.make_branch('branch')
170
139
        branch.create_checkout('tree', lightweight=True)
171
 
        osutils.rename('branch', 'branch1')
 
140
        os.rename('branch', 'branch1')
172
141
 
173
142
    def test_switch_lightweight_after_branch_moved(self):
174
143
        self.prepare_lightweight_switch()
214
183
        # The new branch should have been created at the same level as
215
184
        # 'branch', because we did not have a '/' segment
216
185
        self.assertEqual(branch.base[:-1] + '2/', tree.branch.base)
217
 
 
218
 
    def test_create_branch_directory_services(self):
219
 
        branch = self.make_branch('branch')
220
 
        tree = branch.create_checkout('tree', lightweight=True)
221
 
        class FooLookup(object):
222
 
            def look_up(self, name, url):
223
 
                return 'foo-'+name
224
 
        directories.register('foo:', FooLookup, 'Create branches named foo-')
225
 
        self.addCleanup(directories.remove, 'foo:')
226
 
        self.run_bzr('switch -b foo:branch2', working_dir='tree')
227
 
        tree = WorkingTree.open('tree')
228
 
        self.assertEndsWith(tree.branch.base, 'foo-branch2/')
229
 
 
230
 
    def test_switch_with_post_switch_hook(self):
231
 
        from bzrlib import branch as _mod_branch
232
 
        calls = []
233
 
        _mod_branch.Branch.hooks.install_named_hook('post_switch',
234
 
            calls.append, None)
235
 
        self.make_branch_and_tree('branch')
236
 
        self.run_bzr('branch branch branch2')
237
 
        self.run_bzr('checkout branch checkout')
238
 
        os.chdir('checkout')
239
 
        self.assertLength(0, calls)
240
 
        out, err = self.run_bzr('switch ../branch2')
241
 
        self.assertLength(1, calls)
242
 
 
243
 
    def test_switch_lightweight_co_with_post_switch_hook(self):
244
 
        from bzrlib import branch as _mod_branch
245
 
        calls = []
246
 
        _mod_branch.Branch.hooks.install_named_hook('post_switch',
247
 
            calls.append, None)
248
 
        self.make_branch_and_tree('branch')
249
 
        self.run_bzr('branch branch branch2')
250
 
        self.run_bzr('checkout --lightweight branch checkout')
251
 
        os.chdir('checkout')
252
 
        self.assertLength(0, calls)
253
 
        out, err = self.run_bzr('switch ../branch2')
254
 
        self.assertLength(1, calls)