← 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: Vincent Ladeuil
  • Date: 2010-06-23 08:19:28 UTC
  • mfrom: (5317 +trunk)
  • mto: (5247.1.11 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100623081928-z9q18q30oo5as831
Merge bzr.dev into cleanup

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.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)
248
248
        self.assertLength(2, calls)
249
249
 
250
250
 
251
 
class TestBranchStacked(ExternalBase):
 
251
class TestBranchStacked(TestCaseWithTransport):
252
252
    """Tests for branch --stacked"""
253
253
 
254
254
    def assertRevisionInRepository(self, repo_path, revid):
376
376
            err)
377
377
 
378
378
 
379
 
class TestSmartServerBranching(ExternalBase):
 
379
class TestSmartServerBranching(TestCaseWithTransport):
380
380
 
381
381
    def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
382
382
        self.setup_smart_server_with_call_log()