Merge lp:~james-w/python-oops-dictconfig/ssl into lp:python-oops-dictconfig

[James Westby]

Enable optional SSL in the amqp publisher.

Unmerged revisions

20. By James Westby on 2014-10-14

Enable optional SSL in the amqp publisher.

=== modified file 'README'
--- README	2014-01-08 10:56:04 +0000
+++ README	2014-10-14 16:51:54 +0000
@@ -87,7 +87,9 @@
 
   * routing_key: The routing key for messages.
 
-There is one other optional key for the amqp publisher:
+There are two other optional keys for the amqp publisher:
+
+  * ssl: whether to use SSL for the amqp connection.
 
   * inherit_id If True any 'True' 'id' in an OOPS report is
                preserved. Handy if an id that has already been shown
 
=== modified file 'oops_dictconfig/dictconfig.py'
--- oops_dictconfig/dictconfig.py	2014-01-08 10:56:04 +0000
+++ oops_dictconfig/dictconfig.py	2014-10-14 16:51:54 +0000
@@ -32,7 +32,8 @@
             userid=args['user'],
             password=args['password'],
             virtual_host=args['vhost'],
-            insist=False
+            insist=False,
+            ssl=publisher_defn.get('ssl', False),
         )
     kwargs = {}
     if 'inherit_id' in publisher_defn:
 
=== modified file 'oops_dictconfig/tests/test_dictconfig.py'
--- oops_dictconfig/tests/test_dictconfig.py	2014-01-08 10:56:04 +0000
+++ oops_dictconfig/tests/test_dictconfig.py	2014-10-14 16:51:54 +0000
@@ -242,6 +242,23 @@
             False,
             publishers[0].connection_factory.keywords['insist'])
 
+    def test_amqp_sets_ssl_False_by_default(self):
+        publisher_defn = self.get_basic_ampq_definition()
+        config = self.get_config_from_dict([publisher_defn])
+        publishers = get_publishers_from_function(config.publisher)
+        self.assertEqual(
+            False,
+            publishers[0].connection_factory.keywords['ssl'])
+
+    def test_amqp_sets_ssl(self):
+        publisher_defn = self.get_basic_ampq_definition()
+        publisher_defn['ssl'] = True
+        config = self.get_config_from_dict([publisher_defn])
+        publishers = get_publishers_from_function(config.publisher)
+        self.assertEqual(
+            True,
+            publishers[0].connection_factory.keywords['ssl'])
+
     def test_amqp_sets_inherit_id(self):
         publisher_defn = self.get_basic_ampq_definition()
         publisher_defn['inherit_id'] = True