/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_branch.py

(jameinel) Transform.rename test shouldn't assume the str form of the
 exception because of locale issues. (Martin [gz])

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) 2006-2011 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')
248
271
        self.assertLength(2, calls)
249
272
 
250
273
 
251
 
class TestBranchStacked(ExternalBase):
 
274
class TestBranchStacked(TestCaseWithTransport):
252
275
    """Tests for branch --stacked"""
253
276
 
254
277
    def assertRevisionInRepository(self, repo_path, revid):
376
399
            err)
377
400
 
378
401
 
379
 
class TestSmartServerBranching(ExternalBase):
 
402
class TestSmartServerBranching(TestCaseWithTransport):
380
403
 
381
404
    def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
382
405
        self.setup_smart_server_with_call_log()
391
414
        # being too low. If rpc_count increases, more network roundtrips have
392
415
        # become necessary for this use case. Please do not adjust this number
393
416
        # upwards without agreement from bzr's network support maintainers.
394
 
        self.assertLength(38, self.hpss_calls)
 
417
        self.assertLength(36, self.hpss_calls)
395
418
 
396
419
    def test_branch_from_trivial_branch_streaming_acceptance(self):
397
420
        self.setup_smart_server_with_call_log()
406
429
        # being too low. If rpc_count increases, more network roundtrips have
407
430
        # become necessary for this use case. Please do not adjust this number
408
431
        # upwards without agreement from bzr's network support maintainers.
409
 
        self.assertLength(10, self.hpss_calls)
 
432
        self.assertLength(9, self.hpss_calls)
410
433
 
411
434
    def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
412
435
        self.setup_smart_server_with_call_log()
426
449
        # being too low. If rpc_count increases, more network roundtrips have
427
450
        # become necessary for this use case. Please do not adjust this number
428
451
        # upwards without agreement from bzr's network support maintainers.
429
 
        self.assertLength(15, self.hpss_calls)
 
452
        self.assertLength(14, self.hpss_calls)
430
453
 
431
454
 
432
455
class TestRemoteBranch(TestCaseWithSFTPServer):