Merge lp:~simonklb/charm-helpers/JUJU_CHARM_DIR into lp:charm-helpers

[Simon Kollberg]

Unmerged revisions

726. By Simon Kollberg on 2017-03-27

Use JUJU_CHARM_DIR instead of CHARM_DIR in hookenv

725. By Simon Kollberg on 2017-03-27

Patch JUJU_CHARM_DIR instead of setting it globally in contrib.hardering tests

=== modified file 'charmhelpers/core/hookenv.py'
--- charmhelpers/core/hookenv.py	2017-02-01 00:12:12 +0000
+++ charmhelpers/core/hookenv.py	2017-04-14 10:45:31 +0000
@@ -753,7 +753,7 @@
 
 def charm_dir():
     """Return the root directory of the current charm"""
-    return os.environ.get('CHARM_DIR')
+    return os.environ.get('JUJU_CHARM_DIR', os.environ.get('CHARM_DIR'))
 
 
 @cached
 
=== modified file 'tests/contrib/hardening/host/checks/test_profile.py'
--- tests/contrib/hardening/host/checks/test_profile.py	2017-03-23 09:45:01 +0000
+++ tests/contrib/hardening/host/checks/test_profile.py	2017-04-14 10:45:31 +0000
@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 from unittest import TestCase
 
 from mock import patch
@@ -49,6 +51,7 @@
         self.assertEqual(1, len(audits))
         self.assertTrue(isinstance(audits[0], profile.TemplatedFile))
 
+    @patch.dict(os.environ, {'JUJU_CHARM_DIR': '/tmp'})
     def test_ProfileContext(self):
         ctxt = profile.ProfileContext()
         self.assertEqual(ctxt(), {
 
=== modified file 'tests/contrib/hardening/test_templating.py'
--- tests/contrib/hardening/test_templating.py	2017-03-20 10:28:01 +0000
+++ tests/contrib/hardening/test_templating.py	2017-04-14 10:45:31 +0000
@@ -19,8 +19,6 @@
 from mock import call, patch
 from unittest import TestCase
 
-os.environ['JUJU_CHARM_DIR'] = '/tmp'
-
 from charmhelpers.contrib.hardening import templating
 from charmhelpers.contrib.hardening import utils
 from charmhelpers.contrib.hardening.audits.file import (
@@ -88,6 +86,7 @@
     @patch.object(templating, 'log', lambda *args, **kwargs: None)
     @patch.object(utils, 'log', lambda *args, **kwargs: None)
     @patch.object(ssh_config_check, 'log', lambda *args, **kwargs: None)
+    @patch.dict(os.environ, {'JUJU_CHARM_DIR': '/tmp'})
     def test_ssh_config_render_and_check_lt_trusty(self, mock_log, mock_write,
                                                    mock_ensure_permissions):
         audits = ssh_config_check.get_audits()
@@ -134,6 +133,7 @@
     @patch.object(templating, 'log', lambda *args, **kwargs: None)
     @patch.object(utils, 'log', lambda *args, **kwargs: None)
     @patch.object(ssh_config_check, 'log', lambda *args, **kwargs: None)
+    @patch.dict(os.environ, {'JUJU_CHARM_DIR': '/tmp'})
     def test_ssh_config_render_and_check_gte_trusty(self, mock_log, mock_write,
                                                     mock_ensure_permissions):
         audits = ssh_config_check.get_audits()
 
=== modified file 'tests/core/test_hookenv.py'
--- tests/core/test_hookenv.py	2017-01-31 21:20:28 +0000
+++ tests/core/test_hookenv.py	2017-04-14 10:45:31 +0000
@@ -1180,8 +1180,13 @@
         self.assertEquals(cache_function('baz'), None)
         self.assertEquals(calls, ['hello', 'foo', 'baz'])
 
+    # TODO Deprecate
+    def test_gets_charm_dir_legacy(self):
+        with patch.dict('os.environ', {'CHARM_DIR': '/var/empty'}):
+            self.assertEqual(hookenv.charm_dir(), '/var/empty')
+
     def test_gets_charm_dir(self):
-        with patch.dict('os.environ', {'CHARM_DIR': '/var/empty'}):
+        with patch.dict('os.environ', {'JUJU_CHARM_DIR': '/var/empty'}):
             self.assertEqual(hookenv.charm_dir(), '/var/empty')
 
     @patch('subprocess.check_output')