← 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: Matthäus G. Chajdas
  • Date: 2010-10-12 01:18:01 UTC
  • mto: (5484.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5485.
  • Revision ID: dev@anteru.net-20101012011801-thahmhfxdzz0j6d4
Remove spaces.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
1
 
# Copyright (C) 2005, 2006, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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.blackbox import ExternalBase
 
30
from bzrlib.tests import TestCaseWithTransport
31
31
from bzrlib.tests import (
32
32
    KnownFailure,
33
33
    HardlinkFeature,
38
38
from bzrlib.workingtree import WorkingTree
39
39
 
40
40
 
41
 
class TestBranch(ExternalBase):
 
41
class TestBranch(TestCaseWithTransport):
42
42
 
43
43
    def example_branch(self, path='.'):
44
44
        tree = self.make_branch_and_tree(path)
174
174
        target_stat = os.stat('target/file1')
175
175
        self.assertEqual(source_stat, target_stat)
176
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)
 
199
 
177
200
    def test_branch_standalone(self):
178
201
        shared_repo = self.make_repository('repo', shared=True)
179
202
        self.example_branch('source')
217
240
        b = branch.Branch.open('b')
218
241
        self.assertEndsWith(b.get_bound_location(), '/a/')
219
242
 
220
 
 
221
 
class TestBranchStacked(ExternalBase):
 
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):
222
275
    """Tests for branch --stacked"""
223
276
 
224
277
    def assertRevisionInRepository(self, repo_path, revid):
325
378
            '  Packs 5 (adds stacking support, requires bzr 1.6)\n'
326
379
            'Source branch format does not support stacking, using format:\n'
327
380
            '  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'
328
383
            'Created new stacked branch referring to %s.\n' % (trunk.base,),
329
384
            err)
330
385
 
338
393
            '  Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
339
394
            'Source branch format does not support stacking, using format:\n'
340
395
            '  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'
341
398
            'Created new stacked branch referring to %s.\n' % (trunk.base,),
342
399
            err)
343
400
 
344
401
 
345
 
class TestSmartServerBranching(ExternalBase):
 
402
class TestSmartServerBranching(TestCaseWithTransport):
346
403
 
347
404
    def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
348
405
        self.setup_smart_server_with_call_log()