← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

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

  • Committer: Curtis Hovey
  • Date: 2011-12-29 05:40:17 UTC
  • mto: This revision was merged to the branch mainline in revision 14606.
  • Revision ID: curtis.hovey@canonical.com-20111229054017-e6ulob0k70kz3sj2
Renamed CanonicalConfig to LaunchpadConfig because that is what it is doing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/testing/layers.py
102
102
from zope.server.logger.pythonlogger import PythonLogger
103
103
 
104
104
from lp.services.config import (
105
 
    CanonicalConfig,
 
105
    LaunchpadConfig,
106
106
    config,
107
107
    dbconfig,
108
108
    )
548
548
    @classmethod
549
549
    def appserver_config(cls):
550
550
        """Return a config suitable for AppServer tests."""
551
 
        return CanonicalConfig(cls.appserver_config_name)
 
551
        return LaunchpadConfig(cls.appserver_config_name)
552
552
 
553
553
    @classmethod
554
554
    def appserver_root_url(cls, facet='mainsite', ensureSlash=False):
1729
1729
    @classmethod
1730
1730
    def setConfig(cls):
1731
1731
        """Stash a config for use."""
1732
 
        cls.appserver_config = CanonicalConfig(
 
1732
        cls.appserver_config = LaunchpadConfig(
1733
1733
            BaseLayer.appserver_config_name, 'runlaunchpad')
1734
1734
 
1735
1735
    @classmethod