/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

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

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')
271
248
        self.assertLength(2, calls)
272
249
 
273
250
 
274
 
class TestBranchStacked(TestCaseWithTransport):
 
251
class TestBranchStacked(ExternalBase):
275
252
    """Tests for branch --stacked"""
276
253
 
277
254
    def assertRevisionInRepository(self, repo_path, revid):
399
376
            err)
400
377
 
401
378
 
402
 
class TestSmartServerBranching(TestCaseWithTransport):
 
379
class TestSmartServerBranching(ExternalBase):
403
380
 
404
381
    def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
405
382
        self.setup_smart_server_with_call_log()