← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/_urllib.py

  • Committer: Martin Pool
  • Date: 2011-06-14 01:26:41 UTC
  • mto: (6034.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 6043.
  • Revision ID: mbp@canonical.com-20110614012641-dnb69zb57ae5je4w
Move all test features into bzrlib.tests.features

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_urllib.py
172
172
 
173
173
def get_test_permutations():
174
174
    """Return the permutations to be used in testing."""
175
 
    from bzrlib import tests
176
 
    from bzrlib.tests import http_server
 
175
    from bzrlib.tests import (
 
176
        features,
 
177
        http_server,
 
178
        )
177
179
    permutations = [(HttpTransport_urllib, http_server.HttpServer_urllib),]
178
 
    if tests.HTTPSServerFeature.available():
 
180
    if features.HTTPSServerFeature.available():
179
181
        from bzrlib.tests import https_server
180
182
        permutations.append((HttpTransport_urllib,
181
183
                             https_server.HTTPSServer_urllib))