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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
145
145
        new = topics.get_detail('current-formats')
146
146
        rest = topics.get_detail('other-formats')
147
147
        experimental, deprecated = rest.split('Deprecated formats')
148
 
        self.assertContainsRe(new, 'bzr help formats')
 
148
        self.assertContainsRe(new, 'formats-help')
149
149
        self.assertContainsRe(new,
150
150
                ':knit:\n    \(native\) \(default\) Format using knits\n')
151
151
        self.assertContainsRe(experimental,
1152
1152
    _transport = HttpTransport_urllib
1153
1153
 
1154
1154
    def _qualified_url(self, host, port):
1155
 
        return 'http+urllib://%s:%s' % (host, port)
 
1155
        result = 'http+urllib://%s:%s' % (host, port)
 
1156
        self.permit_url(result)
 
1157
        return result
1156
1158
 
1157
1159
 
1158
1160
 
1162
1164
    """Tests redirections for pycurl implementation"""
1163
1165
 
1164
1166
    def _qualified_url(self, host, port):
1165
 
        return 'http+pycurl://%s:%s' % (host, port)
 
1167
        result = 'http+pycurl://%s:%s' % (host, port)
 
1168
        self.permit_url(result)
 
1169
        return result
1166
1170
 
1167
1171
 
1168
1172
class TestHTTPRedirections_nosmart(TestHTTPRedirections,
1172
1176
    _transport = NoSmartTransportDecorator
1173
1177
 
1174
1178
    def _qualified_url(self, host, port):
1175
 
        return 'nosmart+http://%s:%s' % (host, port)
 
1179
        result = 'nosmart+http://%s:%s' % (host, port)
 
1180
        self.permit_url(result)
 
1181
        return result
1176
1182
 
1177
1183
 
1178
1184
class TestHTTPRedirections_readonly(TestHTTPRedirections,
1182
1188
    _transport = ReadonlyTransportDecorator
1183
1189
 
1184
1190
    def _qualified_url(self, host, port):
1185
 
        return 'readonly+http://%s:%s' % (host, port)
 
1191
        result = 'readonly+http://%s:%s' % (host, port)
 
1192
        self.permit_url(result)
 
1193
        return result
1186
1194
 
1187
1195
 
1188
1196
class TestDotBzrHidden(TestCaseWithTransport):