← Back to branch summary

~moon127/charms/trusty/ceilometer/add-execd-preinstall

« back to all changes in this revision

Viewing changes to unit_tests/test_ceilometer_utils.py

  • Committer: James Page
  • Date: 2014-03-28 14:31:31 UTC
  • mfrom: (45.2.8 ssl-everywhere)
  • mto: This revision was merged to the branch mainline in revision 48.
  • Revision ID: james.page@canonical.com-20140328143131-8jnhj1033s63icux
Merge ssl-everywhere

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit_tests/test_ceilometer_utils.py
38
38
 
39
39
    def test_restart_map(self):
40
40
        restart_map = utils.restart_map()
41
 
        self.assertEquals(restart_map,
42
 
                          {'/etc/ceilometer/ceilometer.conf': [
43
 
                              'ceilometer-agent-central',
44
 
                              'ceilometer-collector',
45
 
                              'ceilometer-api']})
 
41
        self.assertEquals(
 
42
            restart_map,
 
43
            {'/etc/ceilometer/ceilometer.conf': [
 
44
                'ceilometer-agent-central',
 
45
                'ceilometer-collector',
 
46
                'ceilometer-api'],
 
47
             "/etc/apache2/sites-available/openstack_https_frontend": [
 
48
                 'apache2'],
 
49
             "/etc/apache2/sites-available/openstack_https_frontend.conf": [
 
50
                 'apache2']
 
51
             }
 
52
        )
46
53
 
47
54
    def test_get_ceilometer_conf(self):
48
55
        class TestContext():
 
56
 
49
57
            def __call__(self):
50
58
                return {'data': 'test'}
51
59
        with patch.dict(utils.CONFIG_FILES,