← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_reference.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reference.py
17
17
 
18
18
from bzrlib import (
19
19
    branch as _mod_branch,
20
 
    controldir,
 
20
    bzrdir,
21
21
    )
22
22
from bzrlib.tests import TestCaseWithTransport
23
23
 
24
24
 
25
25
class TestReference(TestCaseWithTransport):
26
26
 
27
 
    def get_default_format(self):
28
 
        format = controldir.format_registry.make_bzrdir('1.9')
29
 
        format.set_branch_format(_mod_branch.BzrBranchFormat8())
30
 
        return format
 
27
    def make_branch(self, location, format=None):
 
28
        if format is None:
 
29
            format = bzrdir.format_registry.make_bzrdir('1.9')
 
30
            format.set_branch_format(_mod_branch.BzrBranchFormat8())
 
31
        return TestCaseWithTransport.make_branch(self, location, format=format)
31
32
 
32
33
    def test_no_args_lists(self):
33
34
        branch = self.make_branch('branch')