← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

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
 
    bzrdir,
 
20
    controldir,
21
21
    )
22
22
from bzrlib.tests import TestCaseWithTransport
23
23
 
24
24
 
25
25
class TestReference(TestCaseWithTransport):
26
26
 
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)
 
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
32
31
 
33
32
    def test_no_args_lists(self):
34
33
        branch = self.make_branch('branch')