Merge lp:~abentley/charms/trusty/juju-reports/test-failure-email into lp:~juju-qa/charms/trusty/juju-reports/trunk

[Aaron Bentley]

Add test-failure-email support to charm.

This branch adds support for a test-failure-email config value.

In a separate series of branches, I add support for sending test failure emails from juju-reports.

Juju reports already sends emails on error. The audience for error emails is the maintainers of reports.vapour.ws, i.e. the juju-qa team. The audience for test failures is the developers of juju as well as the maintainers of the CI infrastracture, i.e. the canonical-juju list.

Since there are two different audiences, they need two different addresses, and this branch adds support for the new address to the charm.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'config.yaml'
--- config.yaml	2015-07-28 21:30:25 +0000
+++ config.yaml	2017-01-06 19:12:50 +0000
@@ -13,6 +13,10 @@
     type: int
     default: -1
     description: "The revno of the bzr branch to use. -1 for current tip."
+  test-failure-email:
+    type: string
+    default: ""
+    description: "Address to mail test failures to."
   error-email:
     type: string
     default: ""

=== modified file 'hooks/common.py'
--- hooks/common.py	2016-07-29 16:37:35 +0000
+++ hooks/common.py	2017-01-06 19:12:50 +0000
@@ -52,7 +52,7 @@
 def install_ini(mongo_url, gh_token, cidata_url, token,
                 error_email, error_email_from, cloud_health_failure_threshold,
                 current_conditions_list, jujuci_url, jujuci_username,
-                jujuci_password, source_path):
+                jujuci_password, source_path, test_failure_email):
     with update_ini(source_path, INI) as config:
         config.set('app:main', 'mongo.url', mongo_url)
         config.set('app:main', 'gh_token', gh_token)
@@ -64,6 +64,7 @@
         config.set('app:main', 'home', HOME)
         config.set('app:main', 'error_email', error_email)
         config.set('app:main', 'error_email_from', error_email_from)
+        config.set('app:main', 'test_failure_email', test_failure_email)
         config.set(
             'app:main', 'cloud_health_failure_threshold',
             cloud_health_failure_threshold)
@@ -449,7 +450,8 @@
                       config['cloud-health-failure-threshold'],
                       config['current-conditions-list'],
                       config['jujuci-url'], config['jujuci-user'],
-                      config['jujuci-pass'], source_path)
+                      config['jujuci-pass'], source_path,
+                      config['test-failure-email'])
     unset = [key for key in [
         'lp-key', 'lp-oauth', 'gh-token', 'charm-bundle-test-token',
         'error-email', 'error-email-from'

=== modified file 'tests/test_common.py'
--- tests/test_common.py	2015-09-25 19:01:03 +0000
+++ tests/test_common.py	2017-01-06 19:12:50 +0000
@@ -77,7 +77,7 @@
                 'error_email', 'error_email_from',
                 'cloud_health_failure_threshold', 'current_conditions_list',
                 'jujuci_url', 'jujuci_username', 'jujuci_password',
-                'source_path')
+                'source_path', 'test_failure_email')
         self.assertEqual(2, mock.call_count)
         mock.assert_any_call('source_path', INI)
         mock.assert_any_call('source_path', 'test.ini')
@@ -93,6 +93,8 @@
         self.assertEqual(
             'token', ini.get('app:main', 'charm_bundle_test_token'))
         self.assertEqual(HOME, ini.get('app:main', 'HOME'))
+        self.assertEqual('test_failure_email',
+                         ini.get('app:main', 'test_failure_email'))
         self.assertEqual('error_email', ini.get('app:main', 'error_email'))
         self.assertEqual(
             'error_email_from', ini.get('app:main', 'error_email_from'))