Merge lp:~abentley/juju-ci-tools/pass-juju-home into lp:juju-ci-tools

[Aaron Bentley]

Fix bug #1449123 by passing juju_home.

Fix bug #1449123: EnvJujuClient24._shell_environ does not correctly handle juju_home

When adding support for cloudsigma, I accidentally broke support for custom juju_home.

[lp:~abentley/juju-ci-tools/pass-juju-home]

933. By Aaron Bentley on 2015-04-27

Fix bug #1449123 by passing juju_home.

[John George (jog)]

Thanks.

review: Approve

=== modified file 'jujupy.py'
--- jujupy.py	2015-04-23 20:44:36 +0000
+++ jujupy.py	2015-04-27 16:20:08 +0000
@@ -472,7 +472,7 @@
 
         Juju's directory must be in the PATH to support plugins.
         """
-        env = super(EnvJujuClient24, self)._shell_environ()
+        env = super(EnvJujuClient24, self)._shell_environ(juju_home)
         if self.env.config.get('type') == 'cloudsigma':
             env[JUJU_DEV_FEATURE_FLAGS] = 'cloudsigma'
         return env

=== modified file 'test_jujupy.py'
--- test_jujupy.py	2015-04-23 20:44:36 +0000
+++ test_jujupy.py	2015-04-27 16:20:08 +0000
@@ -95,6 +95,12 @@
         env = client._shell_environ()
         self.assertEqual(env[JUJU_DEV_FEATURE_FLAGS], 'cloudsigma')
 
+    def test__shell_environ_juju_home(self):
+        client = EnvJujuClient24(
+            SimpleEnvironment('baz', {'type': 'ec2'}), '1.24-foobar', 'path')
+        env = client._shell_environ(juju_home='asdf')
+        self.assertEqual(env['JUJU_HOME'], 'asdf')
+
 
 class TestEnvJujuClient(ClientTest):