1
=== modified file 'quickstart/models/envs.py'
2
--- quickstart/models/envs.py	2014-01-16 12:41:47 +0000
3
+++ quickstart/models/envs.py	2014-01-20 12:04:02 +0000
4
@@ -111,19 +111,22 @@
5
111
    env_name = os.getenv('JUJU_ENV', '').strip()
111
    env_name = os.getenv('JUJU_ENV', '').strip()
6
112
    if env_name:
112
    if env_name:
7
113
        return env_name
113
        return env_name
8
114
    # XXX 2013-10-16 frankban bug=1193244:
9
115
        # Support the new behavior of juju-switch, currently under development:
10
116
        # the command will just output the environment name, or exit with an
11
117
        # error if no default environment is configured.
12
118
    # The "juju switch" command parses ~/.juju/current-environment file. If the
114
    # The "juju switch" command parses ~/.juju/current-environment file. If the
13
119
    # environment name is not found there, then it tries to retrieve the name
115
    # environment name is not found there, then it tries to retrieve the name
14
120
    # from the "default" section of the ~/.juju/environments.yaml file.
116
    # from the "default" section of the ~/.juju/environments.yaml file.
15
121
    retcode, output, _ = utils.call('juju', 'switch')
117
    retcode, output, _ = utils.call('juju', 'switch')
16
118
    # Before juju-core 1.17, the "juju switch" command returns a human readable
17
119
    # output. Newer releases just output the environment name, or exit with an
18
120
    # error if no default environment is configured.
19
122
    if retcode:
121
    if retcode:
20
123
        return None
122
        return None
21
123
    # Use a regular expression to check if "juju switch" returned a human
22
124
    # readable output.
23
124
    match = _juju_switch_expression.match(output)
125
    match = _juju_switch_expression.match(output)
24
125
    if match is not None:
126
    if match is not None:
25
126
        return match.groups()[0]
127
        return match.groups()[0]
26
128
    # At this point we can safely assume we are using the newer "juju switch".
27
129
    return output.strip()
28
127
130
29
128
131
30
129
def create_empty_env_db():
132
def create_empty_env_db():
31
130
133
32
=== modified file 'quickstart/tests/models/test_envs.py'
33
--- quickstart/tests/models/test_envs.py	2014-01-16 12:41:47 +0000
34
+++ quickstart/tests/models/test_envs.py	2014-01-20 12:04:02 +0000
35
@@ -58,9 +58,10 @@
36
58
                env_name = envs.get_default_env_name()
58
                env_name = envs.get_default_env_name()
37
59
        self.assertIsNone(env_name)
59
        self.assertIsNone(env_name)
38
60
60
42
61
    def test_juju_switch(self):
61
    def test_juju_switch_old_behavior(self):
43
62
        # The environment name is successfully returned if previously set using
62
        # The environment name is successfully returned if retrievable using
44
63
        # the "juju switch" command.
63
        # the "juju switch" command. This test exercises the old "juju switch"
45
64
        # returning a human readable output.
46
64
        output = 'Current environment: "hp"\n'
65
        output = 'Current environment: "hp"\n'
47
65
        with self.patch_call(0, output=output) as mock_call:
66
        with self.patch_call(0, output=output) as mock_call:
48
66
            with mock.patch('os.environ', {}):
67
            with mock.patch('os.environ', {}):
49
@@ -68,6 +69,18 @@
50
68
        self.assertEqual('hp', env_name)
69
        self.assertEqual('hp', env_name)
51
69
        mock_call.assert_called_once_with('juju', 'switch')
70
        mock_call.assert_called_once_with('juju', 'switch')
52
70
71
53
72
    def test_juju_switch_new_behavior(self):
54
73
        # The environment name is successfully returned if retrievable using
55
74
        # the "juju switch" command. This test exercises the new "juju switch"
56
75
        # returning a machine readable output (just the name of the env).
57
76
        # This new behavior has been introduced in juju-core 1.17.
58
77
        output = 'ec2\n'
59
78
        with self.patch_call(0, output=output) as mock_call:
60
79
            with mock.patch('os.environ', {}):
61
80
                env_name = envs.get_default_env_name()
62
81
        self.assertEqual('ec2', env_name)
63
82
        mock_call.assert_called_once_with('juju', 'switch')
64
83
65
71
    def test_juju_switch_failure(self):
84
    def test_juju_switch_failure(self):
66
72
        # The environment name is not found if "juju switch" returns an error.
85
        # The environment name is not found if "juju switch" returns an error.
67
73
        with self.patch_call(1) as mock_call:
86
        with self.patch_call(1) as mock_call:
68
@@ -76,14 +89,6 @@
69
76
        self.assertIsNone(env_name)
89
        self.assertIsNone(env_name)
70
77
        mock_call.assert_called_once_with('juju', 'switch')
90
        mock_call.assert_called_once_with('juju', 'switch')
71
78
91
72
79
    def test_juju_switch_nonsense(self):
73
80
        # The environment name is not found if "juju switch" goes crazy.
74
81
        with self.patch_call(0, output='Exterminate!') as mock_call:
75
82
            with mock.patch('os.environ', {}):
76
83
                env_name = envs.get_default_env_name()
77
84
        self.assertIsNone(env_name)
78
85
        mock_call.assert_called_once_with('juju', 'switch')
79
86
80
87
92
81
88
class TestCreateEmptyEnvDb(unittest.TestCase):
93
class TestCreateEmptyEnvDb(unittest.TestCase):
82
89
94
Status:	Merged
Merged at revision:	48
Proposed branch:	lp:~frankban/juju-quickstart/new-juju-switch
Merge into:	lp:juju-quickstart
Diff against target:	81 lines (+23/-15) 2 files modified quickstart/models/envs.py (+7/-4) quickstart/tests/models/test_envs.py (+16/-11)
To merge this branch:	bzr merge lp:~frankban/juju-quickstart/new-juju-switch
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju GUI Hackers		2014-01-20	Pending
Review via email: mp+202299@code.launchpad.net