← Back to branch summary

~tanuki/charms/trusty/haproxy/trunk

« back to all changes in this revision

Viewing changes to hooks/tests/test_helpers.py

  • Committer: Christopher Glass
  • Date: 2015-08-18 07:47:27 UTC
  • mfrom: (95.1.1 ciphers-support)
  • Revision ID: christopher.glass@canonical.com-20150818074727-npv3u6jz7wovj3kl
Merge lp:~free.ekanayaka/charms/trusty/haproxy/ciphers-support [a=free.ekanayaka] [r=tribaal]

Add a config option to specify what ciphers to use when SSL is enabled.
Default to a sane selection of ciphers, in particular disallowing RC4 and null encryption.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/tests/test_helpers.py
23
23
            'global_group': 'foo-group',
24
24
            'global_spread_checks': 234,
25
25
            'global_default_dh_param': 345,
 
26
            'global_default_bind_ciphers': "my:ciphers",
26
27
            'global_debug': False,
27
28
            'global_quiet': False,
28
29
            'global_stats_socket': True,
40
41
            '    group foo-group',
41
42
            '    spread-checks 234',
42
43
            '    tune.ssl.default-dh-param 345',
 
44
            '    ssl-default-bind-ciphers my:ciphers',
43
45
            '    stats socket %s mode 0600' % sock_path,
44
46
        ])
45
47
        self.assertEqual(result, expected)
55
57
            'global_group': 'foo-group',
56
58
            'global_spread_checks': 234,
57
59
            'global_default_dh_param': 345,
 
60
            'global_default_bind_ciphers': "my:ciphers",
58
61
            'global_debug': True,
59
62
            'global_quiet': True,
60
63
            'global_stats_socket': False,
73
76
            '    quiet',
74
77
            '    spread-checks 234',
75
78
            '    tune.ssl.default-dh-param 345',
 
79
            '    ssl-default-bind-ciphers my:ciphers',
76
80
        ])
77
81
        self.assertEqual(result, expected)
78
82