← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2009-09-14 02:30:23 UTC
  • mto: This revision was merged to the branch mainline in revision 4693.
  • Revision ID: mbp@sourcefrog.net-20090914023023-ros0f3ndo04j3bww
https://launchpad.net/bugs/429151
Clearer docs about bzr help.  (Thanks to Naoki)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008, 2009 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
27
27
    revision as _mod_revision,
28
28
    )
29
29
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
30
 
from bzrlib.tests import TestCaseWithTransport
 
30
from bzrlib.tests.blackbox import ExternalBase
31
31
from bzrlib.tests import (
32
32
    KnownFailure,
33
33
    HardlinkFeature,
34
 
    test_server,
35
34
    )
36
35
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
37
36
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
38
37
from bzrlib.workingtree import WorkingTree
39
38
 
40
39
 
41
 
class TestBranch(TestCaseWithTransport):
 
40
class TestBranch(ExternalBase):
42
41
 
43
42
    def example_branch(self, path='.'):
44
43
        tree = self.make_branch_and_tree(path)
172
171
        out, err = self.run_bzr(['branch', 'source', 'target', '--hardlink'])
173
172
        source_stat = os.stat('source/file1')
174
173
        target_stat = os.stat('target/file1')
175
 
        self.assertEqual(source_stat, target_stat)
176
 
 
177
 
    def test_branch_files_from(self):
178
 
        source = self.make_branch_and_tree('source')
179
 
        self.build_tree(['source/file1'])
180
 
        source.add('file1')
181
 
        source.commit('added file')
182
 
        out, err = self.run_bzr('branch source target --files-from source')
183
 
        self.failUnlessExists('target/file1')
184
 
 
185
 
    def test_branch_files_from_hardlink(self):
186
 
        self.requireFeature(HardlinkFeature)
187
 
        source = self.make_branch_and_tree('source')
188
 
        self.build_tree(['source/file1'])
189
 
        source.add('file1')
190
 
        source.commit('added file')
191
 
        source.bzrdir.sprout('second')
192
 
        out, err = self.run_bzr('branch source target --files-from second'
193
 
                                ' --hardlink')
194
 
        source_stat = os.stat('source/file1')
195
 
        second_stat = os.stat('second/file1')
196
 
        target_stat = os.stat('target/file1')
197
 
        self.assertNotEqual(source_stat, target_stat)
198
 
        self.assertEqual(second_stat, target_stat)
 
174
        same_file = (source_stat == target_stat)
 
175
        if same_file:
 
176
            pass
 
177
        else:
 
178
            # https://bugs.edge.launchpad.net/bzr/+bug/408193
 
179
            self.assertContainsRe(err, "hardlinking working copy files is "
 
180
                "not currently supported")
 
181
            raise KnownFailure("--hardlink doesn't work in formats "
 
182
                "that support content filtering (#408193)")
199
183
 
200
184
    def test_branch_standalone(self):
201
185
        shared_repo = self.make_repository('repo', shared=True)
233
217
        self.assertEqual('', out)
234
218
        self.assertEqual('bzr: ERROR: Already a branch: "b".\n', err)
235
219
 
236
 
    def test_branch_bind(self):
237
 
        self.example_branch('a')
238
 
        out, err = self.run_bzr('branch a b --bind')
239
 
        self.assertEndsWith(err, "New branch bound to a\n")
240
 
        b = branch.Branch.open('b')
241
 
        self.assertEndsWith(b.get_bound_location(), '/a/')
242
 
 
243
 
    def test_branch_with_post_branch_init_hook(self):
244
 
        calls = []
245
 
        branch.Branch.hooks.install_named_hook('post_branch_init',
246
 
            calls.append, None)
247
 
        self.assertLength(0, calls)
248
 
        self.example_branch('a')
249
 
        self.assertLength(1, calls)
250
 
        self.run_bzr('branch a b')
251
 
        self.assertLength(2, calls)
252
 
 
253
 
    def test_checkout_with_post_branch_init_hook(self):
254
 
        calls = []
255
 
        branch.Branch.hooks.install_named_hook('post_branch_init',
256
 
            calls.append, None)
257
 
        self.assertLength(0, calls)
258
 
        self.example_branch('a')
259
 
        self.assertLength(1, calls)
260
 
        self.run_bzr('checkout a b')
261
 
        self.assertLength(2, calls)
262
 
 
263
 
    def test_lightweight_checkout_with_post_branch_init_hook(self):
264
 
        calls = []
265
 
        branch.Branch.hooks.install_named_hook('post_branch_init',
266
 
            calls.append, None)
267
 
        self.assertLength(0, calls)
268
 
        self.example_branch('a')
269
 
        self.assertLength(1, calls)
270
 
        self.run_bzr('checkout --lightweight a b')
271
 
        self.assertLength(2, calls)
272
 
 
273
 
 
274
 
class TestBranchStacked(TestCaseWithTransport):
 
220
 
 
221
class TestBranchStacked(ExternalBase):
275
222
    """Tests for branch --stacked"""
276
223
 
277
224
    def assertRevisionInRepository(self, repo_path, revid):
362
309
 
363
310
    def test_branch_stacked_from_smart_server(self):
364
311
        # We can branch stacking on a smart server
365
 
        self.transport_server = test_server.SmartTCPServer_for_testing
 
312
        from bzrlib.smart.server import SmartTCPServer_for_testing
 
313
        self.transport_server = SmartTCPServer_for_testing
366
314
        trunk = self.make_branch('mainline', format='1.9')
367
315
        out, err = self.run_bzr(
368
316
            ['branch', '--stacked', self.get_url('mainline'), 'shallow'])
378
326
            '  Packs 5 (adds stacking support, requires bzr 1.6)\n'
379
327
            'Source branch format does not support stacking, using format:\n'
380
328
            '  Branch format 7\n'
381
 
            'Doing on-the-fly conversion from RepositoryFormatKnitPack1() to RepositoryFormatKnitPack5().\n'
382
 
            'This may take some time. Upgrade the repositories to the same format for better performance.\n'
383
329
            'Created new stacked branch referring to %s.\n' % (trunk.base,),
384
330
            err)
385
331
 
393
339
            '  Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
394
340
            'Source branch format does not support stacking, using format:\n'
395
341
            '  Branch format 7\n'
396
 
            'Doing on-the-fly conversion from RepositoryFormatKnitPack4() to RepositoryFormatKnitPack5RichRoot().\n'
397
 
            'This may take some time. Upgrade the repositories to the same format for better performance.\n'
398
342
            'Created new stacked branch referring to %s.\n' % (trunk.base,),
399
343
            err)
400
344
 
401
345
 
402
 
class TestSmartServerBranching(TestCaseWithTransport):
 
346
class TestSmartServerBranching(ExternalBase):
403
347
 
404
348
    def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
405
349
        self.setup_smart_server_with_call_log()