/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 breezy/tests/test_bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:06:46 UTC
  • mfrom: (6673 work)
  • mto: This revision was merged to the branch mainline in revision 6675.
  • Revision ID: jelmer@jelmer.uk-20170610000646-xj6jh277lo4xuo10
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bzrdir.py
25
25
 
26
26
from .. import (
27
27
    branch,
 
28
    bzrbranch,
28
29
    bzrdir,
29
30
    config,
30
31
    controldir,
42
43
    workingtree_4,
43
44
    )
44
45
import breezy.branch
 
46
import breezy.bzrbranch
45
47
from ..branchfmt.fullhistory import BzrBranchFormat5
46
48
from ..errors import (
47
49
    NotBranchError,
59
61
    http_server,
60
62
    http_utils,
61
63
    )
62
 
from .test_http import TestWithTransport_pycurl
63
64
from ..transport import (
64
65
    memory,
65
66
    pathfilter,
109
110
            'branch6',
110
111
            'breezy.repofmt.knitrepo.RepositoryFormatKnit3',
111
112
            'Experimental successor to knit.  Use at your own risk.',
112
 
            branch_format='breezy.branch.BzrBranchFormat6',
 
113
            branch_format='breezy.bzrbranch.BzrBranchFormat6',
113
114
            experimental=True)
114
115
        bzrdir.register_metadir(my_format_registry,
115
116
            'hidden format',
116
117
            'breezy.repofmt.knitrepo.RepositoryFormatKnit3',
117
118
            'Experimental successor to knit.  Use at your own risk.',
118
 
            branch_format='breezy.branch.BzrBranchFormat6', hidden=True)
 
119
            branch_format='breezy.bzrbranch.BzrBranchFormat6', hidden=True)
119
120
        my_format_registry.register('hiddendeprecated', DeprecatedBzrDirFormat,
120
121
            'Old format.  Slower and does not support things. ', hidden=True)
121
122
        my_format_registry.register_lazy('hiddenlazy', 'breezy.tests.test_bzrdir',
137
138
            knitrepo.RepositoryFormatKnit1)
138
139
        my_bzrdir = my_format_registry.make_bzrdir('branch6')
139
140
        self.assertIsInstance(my_bzrdir.get_branch_format(),
140
 
                              breezy.branch.BzrBranchFormat6)
 
141
                              breezy.bzrbranch.BzrBranchFormat6)
141
142
 
142
143
    def test_get_help(self):
143
144
        my_format_registry = self.make_format_registry()
508
509
        # Make stackable source branch with an unstackable repo format.
509
510
        source_bzrdir = self.make_bzrdir('source')
510
511
        knitpack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
511
 
        source_branch = breezy.branch.BzrBranchFormat7().initialize(
 
512
        source_branch = breezy.bzrbranch.BzrBranchFormat7().initialize(
512
513
            source_bzrdir)
513
514
        # Make a directory with a default stacking policy
514
515
        parent_bzrdir = self.make_bzrdir('parent')
1177
1178
 
1178
1179
 
1179
1180
 
1180
 
class TestHTTPRedirections_pycurl(TestWithTransport_pycurl,
1181
 
                                  TestHTTPRedirections,
1182
 
                                  http_utils.TestCaseWithTwoWebservers):
1183
 
    """Tests redirections for pycurl implementation"""
1184
 
 
1185
 
    def _qualified_url(self, host, port):
1186
 
        result = 'http+pycurl://%s:%s' % (host, port)
1187
 
        self.permit_url(result)
1188
 
        return result
1189
 
 
1190
 
 
1191
1181
class TestHTTPRedirections_nosmart(TestHTTPRedirections,
1192
1182
                                  http_utils.TestCaseWithTwoWebservers):
1193
1183
    """Tests redirections for the nosmart decorator"""