Merge lp:~abentley/charms/trusty/juju-reports/auto-test-ini into lp:~juju-qa/charms/trusty/juju-reports/trunk

[Aaron Bentley]

Generate test.ini with valid mongo.

This branch updates the charm to automatically supply a working test.ini

The test.ini supplied by jujureports is intended for use in a single-machine configuration, so a "make deploy" produces a jujureports without working tests. This branch updates mongo.url in test.ini to be the actual mongodb used by the charm. This is safe because test.ini uses a different database (juju_test rather than juju).

[Curtis Hovey (sinzui)]

thank you.

review: Approve (code)

=== modified file 'hooks/common.py'
--- hooks/common.py	2015-02-25 15:26:36 +0000
+++ hooks/common.py	2015-02-26 15:28:39 +0000
@@ -1,6 +1,7 @@
 from ConfigParser import (
     ConfigParser,
     NoSectionError)
+from contextlib import contextmanager
 import errno
 import os
 from pwd import getpwnam
@@ -21,8 +22,8 @@
 REVISION_INFO_FILE = os.path.join(HOME, 'last-source-revision')
 
 
-def get_ini_path(source_path):
-    return os.path.join(source_path, INI)
+def get_ini_path(source_path, base_filename=INI):
+    return os.path.join(source_path, base_filename)
 
 
 def get_ini(source_path):
@@ -35,25 +36,35 @@
     return os.path.join(source_path, 'resources/{}.template'.format(name))
 
 
+@contextmanager
+def update_ini(source_path, base_filename):
+    template_path = get_template_path(base_filename, source_path)
+    output_path = get_ini_path(source_path, base_filename)
+    if not os.path.exists(template_path):
+        template_path = output_path
+    config = ConfigParser()
+    config.read(template_path)
+    yield config
+    with open(output_path, 'w') as out_file:
+        config.write(out_file)
+
+
 def install_ini(mongo_url, gh_token, cidata_url, token,
                 error_email, error_email_from, cloud_health_failure_threshold,
                 source_path):
-    config = ConfigParser()
-    path = get_template_path(INI, source_path)
-    if not os.path.exists(path):
-        path = get_ini_path(source_path)
-    config.read(path)
-    config.set('app:main', 'mongo.url', mongo_url)
-    config.set('app:main', 'gh_token', gh_token)
-    config.set('app:main', 'cidata.url', cidata_url)
-    config.set('app:main', 'charm_bundle_test_token', token)
-    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', 'cloud_health_failure_threshold',
-        cloud_health_failure_threshold)
-    config.write(open(get_ini_path(source_path), 'w'))
+    with update_ini(source_path, INI) as config:
+        config.set('app:main', 'mongo.url', mongo_url)
+        config.set('app:main', 'gh_token', gh_token)
+        config.set('app:main', 'cidata.url', cidata_url)
+        config.set('app:main', 'charm_bundle_test_token', token)
+        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', 'cloud_health_failure_threshold',
+            cloud_health_failure_threshold)
+    with update_ini(source_path, 'test.ini') as config:
+        config.set('app:main', 'mongo.url', mongo_url)
     return config