← Back to branch summary

~juju/ubuntu/precise/juju/0.5

« back to all changes in this revision

Viewing changes to juju/unit/tests/test_charm.py

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-04-18 15:45:34 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20120418154534-tkoahx8nmnrb9ph7
Tags: 0.5+bzr531-0ubuntu1
https://launchpad.net/bugs/985249
https://launchpad.net/bugs/819329
* New upstream snapshot (LP: #985249)
* d/p/fix-tests-without-aws-key.patch: Dropped as it has been
  superseded by a better upstream fix (LP: #819329)
* d/p/no-write-sample-on-help.patch: Dropped, Applied upstream.
* d/p/disable-failing-zookeeper-test.patch refreshed.
* d/control: new code requires latest txzookeeper upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/unit/tests/test_charm.py
11
11
from juju.charm.publisher import CharmPublisher
12
12
from juju.charm.tests import local_charm_id
13
13
from juju.charm.tests.test_directory import sample_directory
14
 
from juju.environment.config import EnvironmentsConfig
15
14
from juju.errors import FileNotFound
16
15
from juju.lib import under
17
 
from juju.state.environment import EnvironmentStateManager
18
16
from juju.state.errors import CharmStateNotFound
19
17
from juju.state.tests.common import StateTestBase
20
18
 
22
20
 
23
21
from juju.lib.mocker import MATCH
24
22
 
25
 
SAMPLE_ENV = """\
26
 
environments:
27
 
  myfirstenv:
28
 
    type: dummy
29
 
    foo: bar
30
 
    storage-directory: %s
31
 
"""
32
 
 
33
23
 
34
24
class CharmPublisherTestBase(StateTestBase):
35
25
 
36
26
    @inlineCallbacks
37
27
    def setUp(self):
38
28
        yield super(CharmPublisherTestBase, self).setUp()
39
 
 
40
 
        config = self.get_test_environment_config()
41
 
        environment = config.get_default()
42
 
 
43
 
        # Store the environment to zookeeper
44
 
        environment_state_manager = EnvironmentStateManager(self.client)
45
 
        yield environment_state_manager.set_config_state(config, "myfirstenv")
46
 
 
47
 
        # Load the environment
48
 
        self.provider = environment.get_machine_provider()
 
29
        yield self.push_default_config()
 
30
        self.provider = self.config.get_default().get_machine_provider()
49
31
        self.storage = self.provider.get_file_storage()
50
32
 
51
 
    def get_test_environment_config(self):
52
 
        sample_config = SAMPLE_ENV % self.makeDir()
53
 
        config = EnvironmentsConfig()
54
 
        config.parse(sample_config)
55
 
        return config
56
 
 
57
33
    @inlineCallbacks
58
34
    def publish_charm(self, charm_path=sample_directory):
59
35
        charm = get_charm_from_path(charm_path)