← 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: Andrew Bennetts
  • Date: 2010-04-14 06:47:18 UTC
  • mto: This revision was merged to the branch mainline in revision 5155.
  • Revision ID: andrew.bennetts@canonical.com-20100414064718-130ptdug4opfjj6b
Link to Python bug in comment.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
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,
38
38
from bzrlib.workingtree import WorkingTree
39
39
 
40
40
 
41
 
class TestBranch(TestCaseWithTransport):
 
41
class TestBranch(ExternalBase):
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
 
 
200
177
    def test_branch_standalone(self):
201
178
        shared_repo = self.make_repository('repo', shared=True)
202
179
        self.example_branch('source')
240
217
        b = branch.Branch.open('b')
241
218
        self.assertEndsWith(b.get_bound_location(), '/a/')
242
219
 
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):
399
346
            err)
400
347
 
401
348
 
402
 
class TestSmartServerBranching(TestCaseWithTransport):
 
349
class TestSmartServerBranching(ExternalBase):
403
350
 
404
351
    def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
405
352
        self.setup_smart_server_with_call_log()