← Back to branch summary

~gz/juju-ci-tools/assess_jes_dump_logs

« back to all changes in this revision

Viewing changes to tests/test_jujupy.py

  • Committer: Aaron Bentley
  • Date: 2016-02-08 15:30:11 UTC
  • mto: This revision was merged to the branch mainline in revision 1259.
  • Revision ID: aaron.bentley@canonical.com-20160208153011-i9f3wg4g0tm963jc
Support transitional jujus.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_jujupy.py
39
39
    EnvJujuClient25,
40
40
    EnvJujuClient26,
41
41
    EnvJujuClient2A1,
 
42
    EnvJujuClient2A2,
42
43
    ErroredUnit,
43
44
    GroupReporter,
44
45
    get_cache_path,
767
768
            self.assertIs(type(client), EnvJujuClient2A1)
768
769
            self.assertEqual(client.version, '2.0-alpha1')
769
770
            client = EnvJujuClient.by_version(None)
770
 
            self.assertIs(type(client), EnvJujuClient)
 
771
            self.assertIs(type(client), EnvJujuClient2A2)
771
772
            self.assertEqual(client.version, '2.0-alpha2')
772
773
            client = EnvJujuClient.by_version(None)
773
774
            self.assertIs(type(client), EnvJujuClient)
2153
2154
                client.get_service_config('foo')
2154
2155
 
2155
2156
 
 
2157
class TestEnvJujuClient2A2(TestCase):
 
2158
 
 
2159
    def test__shell_environ_juju_home(self):
 
2160
        client = EnvJujuClient2A2(
 
2161
            SimpleEnvironment('baz', {'type': 'ec2'}), '1.25-foobar', 'path',
 
2162
            'asdf')
 
2163
        with patch.dict(os.environ, {'PATH': ''}):
 
2164
            env = client._shell_environ()
 
2165
        # For transition, supply both.
 
2166
        self.assertEqual(env['JUJU_HOME'], 'asdf')
 
2167
        self.assertEqual(env['JUJU_DATA'], 'asdf')
 
2168
 
 
2169
 
2156
2170
class TestEnvJujuClient1X(ClientTest):
2157
2171
 
2158
2172
    def test_no_duplicate_env(self):
2258
2272
            self.assertIs(type(client), EnvJujuClient2A1)
2259
2273
            self.assertEqual(client.version, '2.0-alpha1')
2260
2274
            client = EnvJujuClient1X.by_version(None)
2261
 
            self.assertIs(type(client), EnvJujuClient)
 
2275
            self.assertIs(type(client), EnvJujuClient2A2)
2262
2276
            self.assertEqual(client.version, '2.0-alpha2')
2263
2277
            client = EnvJujuClient1X.by_version(None)
2264
2278
            self.assertIs(type(client), EnvJujuClient)