← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/_pycurl.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/_pycurl.py
423
423
 
424
424
def get_test_permutations():
425
425
    """Return the permutations to be used in testing."""
426
 
    from bzrlib import tests
 
426
    from bzrlib.tests import features
427
427
    from bzrlib.tests import http_server
428
428
    permutations = [(PyCurlTransport, http_server.HttpServer_PyCurl),]
429
 
    if tests.HTTPSServerFeature.available():
 
429
    if features.HTTPSServerFeature.available():
430
430
        from bzrlib.tests import (
431
431
            https_server,
432
432
            ssl_certs,