← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/testing/layers.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-12-30 11:28:39 UTC
  • mfrom: (14606.2.10 apocatest)
  • Revision ID: launchpad@pqm.canonical.com-20111230112839-iogfa6k9x40ymp6c
[r=wgrant][no-qa] Merge canonical.testing into lp.services.testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/testing/layers.py
108
108
    get_default_timeout_function,
109
109
    set_default_timeout_function,
110
110
    )
111
 
from canonical.testing.profiled import profiled
112
111
from lp.services.config import (
113
112
    config,
114
113
    dbconfig,
132
131
from lp.services.osutils import kill_by_pidfile
133
132
from lp.services.rabbit.server import RabbitServer
134
133
from lp.services.scripts import execute_zcml_for_scripts
 
134
from lp.services.testing.profiled import profiled
135
135
from lp.services.webapp.authorization import LaunchpadPermissiveSecurityPolicy
136
136
from lp.services.webapp.interfaces import (
137
137
    DEFAULT_FLAVOR,