← Back to branch summary

~bloodearnest/juju-deployer/annotate-branches

« back to all changes in this revision

Viewing changes to deployer/tests/test_config.py

  • Committer: Simon Davy
  • Date: 2015-03-30 15:16:10 UTC
  • mfrom: (126.1.18 juju-deployer)
  • Revision ID: bloodearnest@gmail.com-20150330151610-ft7lwajcbnnroa39
merge upstream and fix review comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
deployer/tests/test_config.py
1
1
import logging
 
2
import mock
2
3
import os
3
4
import tempfile
4
5
import yaml
27
28
        self.assertRaises(ErrorExit, config.get, 'zeeland')
28
29
        result = config.get("openstack-precise-ec2")
29
30
        self.assertTrue(isinstance(result, Deployment))
 
31
        self.assertEqual(config.version, 3)
30
32
 
31
33
    def test_config(self):
32
34
        config = ConfigStack([
38
40
            [u'my-files-frontend-dev', u'wordpress'])
39
41
        deployment = config.get("wordpress")
40
42
        self.assertTrue(deployment)
 
43
        self.assertEqual(config.version, 3)
 
44
 
 
45
    def test_config_v4(self):
 
46
        config = ConfigStack([
 
47
            os.path.join(self.test_data_dir, 'v4', 'simple.yaml')])
 
48
        config.load()
 
49
        self.assertEqual(
 
50
            config.keys(),
 
51
            [os.path.join(self.test_data_dir, 'v4', 'simple.yaml')])
 
52
        with mock.patch('deployer.config.ConfigStack._resolve_inherited') \
 
53
                as mock_resolve:
 
54
            deployment = config.get(config.keys()[0])
 
55
            self.assertTrue(deployment)
 
56
            self.assertFalse(mock_resolve.called)
 
57
        self.assertEqual(config.version, 4)
41
58
 
42
59
    def test_config_include_file(self):
43
60
        config = ConfigStack([