← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/scripts/tests/test_runlaunchpad.py

  • Committer: Curtis Hovey
  • Date: 2011-12-29 05:29:36 UTC
  • mto: This revision was merged to the branch mainline in revision 14606.
  • Revision ID: curtis.hovey@canonical.com-20111229052936-c261pibg1p6ze6m4
Moved canonical.config to lp.services.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/scripts/tests/test_runlaunchpad.py
16
16
 
17
17
import testtools
18
18
 
19
 
import canonical.config
20
 
from canonical.config import config
 
19
import lp.services.config
 
20
from lp.services.config import config
21
21
from lp.scripts.runlaunchpad import (
22
22
    get_services_to_run,
23
23
    process_config_arguments,
78
78
        super(TestDefaultConfigArgument, self).setUp()
79
79
        self.config_root = tempfile.mkdtemp('configs')
80
80
        self.saved_instance = config.instance_name
81
 
        self.saved_config_roots = canonical.config.CONFIG_ROOT_DIRS
82
 
        canonical.config.CONFIG_ROOT_DIRS = [self.config_root]
 
81
        self.saved_config_roots = lp.services.config.CONFIG_ROOT_DIRS
 
82
        lp.services.config.CONFIG_ROOT_DIRS = [self.config_root]
83
83
        self.addCleanup(self.cleanUp)
84
84
 
85
85
    def cleanUp(self):
86
86
        shutil.rmtree(self.config_root)
87
 
        canonical.config.CONFIG_ROOT_DIRS = self.saved_config_roots
 
87
        lp.services.config.CONFIG_ROOT_DIRS = self.saved_config_roots
88
88
        config.setInstance(self.saved_instance)
89
89
 
90
90
    def test_keep_argument(self):