← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

(jameinel) Allow 'bzr serve' to interpret SIGHUP as a graceful shutdown.
 (bug #795025) (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_switch.py
20
20
 
21
21
import os
22
22
 
23
 
from bzrlib import osutils
 
23
from bzrlib import (
 
24
        osutils,
 
25
        urlutils,
 
26
        branch,
 
27
        )
24
28
from bzrlib.workingtree import WorkingTree
25
 
from bzrlib.tests import TestCaseWithTransport
 
29
from bzrlib.tests import (
 
30
        TestCaseWithTransport,
 
31
        script,
 
32
        )
26
33
from bzrlib.directory_service import directories
27
34
 
28
35
 
129
136
        """Using switch on a heavy checkout should find master sibling
130
137
 
131
138
        The behaviour of lighweight and heavy checkouts should be
132
 
        consistentwhen using the convenient "switch to sibling" feature
 
139
        consistent when using the convenient "switch to sibling" feature
133
140
        Both should switch to a sibling of the branch
134
141
        they are bound to, and not a sibling of themself"""
135
142
 
149
156
        tree = self._create_sample_tree()
150
157
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
151
158
        self.run_bzr(['switch', 'branch-1', '-r1'], working_dir='checkout')
152
 
        self.failUnlessExists('checkout/file-1')
153
 
        self.failIfExists('checkout/file-2')
 
159
        self.assertPathExists('checkout/file-1')
 
160
        self.assertPathDoesNotExist('checkout/file-2')
154
161
 
155
162
    def test_switch_only_revision(self):
156
163
        tree = self._create_sample_tree()
157
164
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
158
 
        self.failUnlessExists('checkout/file-1')
159
 
        self.failUnlessExists('checkout/file-2')
 
165
        self.assertPathExists('checkout/file-1')
 
166
        self.assertPathExists('checkout/file-2')
160
167
        self.run_bzr(['switch', '-r1'], working_dir='checkout')
161
 
        self.failUnlessExists('checkout/file-1')
162
 
        self.failIfExists('checkout/file-2')
 
168
        self.assertPathExists('checkout/file-1')
 
169
        self.assertPathDoesNotExist('checkout/file-2')
163
170
        # Check that we don't accept a range
164
171
        self.run_bzr_error(
165
172
            ['bzr switch --revision takes exactly one revision identifier'],
270
277
        self.run_bzr('checkout --lightweight a checkout')
271
278
        self.run_bzr('switch --directory checkout b')
272
279
        self.assertFileEqual('initial\nmore\n', 'checkout/a')
 
280
 
 
281
 
 
282
class TestSwitchParentLocationBase(TestCaseWithTransport):
 
283
 
 
284
    def setUp(self):
 
285
        """Set up a repository and branch ready for testing."""
 
286
        super(TestSwitchParentLocationBase, self).setUp()
 
287
        self.script_runner = script.ScriptRunner()
 
288
        self.script_runner.run_script(self, '''
 
289
                $ bzr init-repo --no-trees repo
 
290
                Shared repository...
 
291
                Location:
 
292
                  shared repository: repo
 
293
                $ bzr init repo/trunk
 
294
                Created a repository branch...
 
295
                Using shared repository: ...
 
296
                ''')
 
297
 
 
298
    def assertParent(self, expected_parent, branch):
 
299
        """Verify that the parent is not None and is set correctly."""
 
300
        actual_parent = branch.get_parent()
 
301
        self.assertIsSameRealPath(urlutils.local_path_to_url(expected_parent),
 
302
                                  branch.get_parent())
 
303
 
 
304
 
 
305
class TestSwitchParentLocation(TestSwitchParentLocationBase):
 
306
 
 
307
    def _checkout_and_switch(self, option=''):
 
308
        self.script_runner.run_script(self, '''
 
309
                $ bzr checkout %(option)s repo/trunk checkout
 
310
                $ cd checkout
 
311
                $ bzr switch --create-branch switched
 
312
                2>Tree is up to date at revision 0.
 
313
                2>Switched to branch:...switched...
 
314
                $ cd ..
 
315
                ''' % locals())
 
316
        bound_branch = branch.Branch.open_containing('checkout')[0]
 
317
        master_branch = branch.Branch.open_containing('repo/switched')[0]
 
318
        return (bound_branch, master_branch)
 
319
 
 
320
    def test_switch_parent_lightweight(self):
 
321
        """Lightweight checkout using bzr switch."""
 
322
        bb, mb = self._checkout_and_switch(option='--lightweight')
 
323
        self.assertParent('repo/trunk', bb)
 
324
        self.assertParent('repo/trunk', mb)
 
325
 
 
326
    def test_switch_parent_heavyweight(self):
 
327
        """Heavyweight checkout using bzr switch."""
 
328
        bb, mb = self._checkout_and_switch()
 
329
        self.assertParent('repo/trunk', bb)
 
330
        self.assertParent('repo/trunk', mb)
 
331
 
 
332
 
 
333
class TestSwitchDoesntOpenMasterBranch(TestCaseWithTransport):
 
334
    # See https://bugs.launchpad.net/bzr/+bug/812285
 
335
    # "bzr switch --create-branch" can point the new branch's parent to the
 
336
    # master branch, but it doesn't have to open it to do so.
 
337
 
 
338
    def test_switch_create_doesnt_open_master_branch(self):
 
339
        master = self.make_branch_and_tree('master')
 
340
        master.commit('one')
 
341
        # Note: not a lightweight checkout
 
342
        checkout = master.branch.create_checkout('checkout')
 
343
        opened = []
 
344
        def open_hook(branch):
 
345
            # Just append the final directory of the branch
 
346
            name = branch.base.rstrip('/').rsplit('/', 1)[1]
 
347
            opened.append(name)
 
348
        branch.Branch.hooks.install_named_hook('open', open_hook,
 
349
                                               'open_hook_logger')
 
350
        self.run_bzr('switch --create-branch -d checkout feature')
 
351
        # We only open the master branch 1 time.
 
352
        # This test should be cleaner to write, but see bug:
 
353
        #  https://bugs.launchpad.net/bzr/+bug/812295
 
354
        self.assertEqual(1, opened.count('master'))