/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/transport/http/_urllib.py

  • Committer: Martin Pool
  • Date: 2009-01-13 05:16:26 UTC
  • mfrom: (3936 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3940.
  • Revision ID: mbp@sourcefrog.net-20090113051626-0d5q6luqdoyx4xaf
Fix recommend_upgrade ui and merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_urllib.py
165
165
 
166
166
def get_test_permutations():
167
167
    """Return the permutations to be used in testing."""
168
 
    from bzrlib.tests.http_server import HttpServer_urllib
169
 
    return [(HttpTransport_urllib, HttpServer_urllib),
170
 
            ]
 
168
    from bzrlib import tests
 
169
    from bzrlib.tests import http_server
 
170
    permutations = [(HttpTransport_urllib, http_server.HttpServer_urllib),]
 
171
    if tests.HTTPSServerFeature.available():
 
172
        from bzrlib.tests import https_server
 
173
        permutations.append((HttpTransport_urllib,
 
174
                             https_server.HTTPSServer_urllib))
 
175
    return permutations