← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/test_lp_directory.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-07-25 03:36:18 UTC
  • mfrom: (6034.2.4 test-feature-cleanup)
  • Revision ID: pqm@pqm.ubuntu.com-20110725033618-n5g9qg6iwyz2dqzw
(mbp) move test feature dependencies into test.features (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/test_lp_directory.py
28
28
from bzrlib.branch import Branch
29
29
from bzrlib.directory_service import directories
30
30
from bzrlib.tests import (
 
31
    features,
31
32
    TestCaseInTempDir,
32
33
    TestCaseWithMemoryTransport
33
34
)
50
51
    transport_scenarios = [
51
52
        ('http', dict(server_class=PreCannedHTTPServer,)),
52
53
        ]
53
 
    if tests.HTTPSServerFeature.available():
 
54
    if features.HTTPSServerFeature.available():
54
55
        transport_scenarios.append(
55
56
            ('https', dict(server_class=PreCannedHTTPSServer,)),
56
57
            )
425
426
    pass
426
427
 
427
428
 
428
 
if tests.HTTPSServerFeature.available():
 
429
if features.HTTPSServerFeature.available():
429
430
    from bzrlib.tests import https_server
430
431
    class PreCannedHTTPSServer(PreCannedServerMixin, https_server.HTTPSServer):
431
432
        pass