Merge lp:~frankban/charms/precise/juju-gui/enable-go-sandbox into lp:~juju-gui/charms/precise/juju-gui/trunk

[Francesco Banconi]

Enable sandbox mode in juju-core environments.

Also added a sandbox functional test and
improved the backend framework unit tests.

https://codereview.appspot.com/13424043/

[Francesco Banconi (frankban)]

Reviewers: mp+183124_code.launchpad.net,

Message:
Please take a look.

Description:
Enable sandbox mode in juju-core environments.

Also added a sandbox functional test and
improved the backend framework unit tests.

https://code.launchpad.net/~frankban/charms/precise/juju-gui/enable-go-sandbox/+merge/183124

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/13424043/

Affected files:
   M Makefile
   A [revision details]
   M hooks/backend.py
   M revision
   M tests/20-functional.test
   M tests/test_backends.py

[Richard Harding (rharding)]

LGTM

https://codereview.appspot.com/13424043/

[Francesco Banconi (frankban)]

*** Submitted:

Enable sandbox mode in juju-core environments.

Also added a sandbox functional test and
improved the backend framework unit tests.

R=rharding
CC=
https://codereview.appspot.com/13424043

https://codereview.appspot.com/13424043/

[Francesco Banconi (frankban)]

Thank you for the review!

https://codereview.appspot.com/13424043/

=== modified file 'Makefile'
--- Makefile	2013-08-28 14:47:13 +0000
+++ Makefile	2013-08-30 10:38:12 +0000
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-JUJUTEST = juju-test --timeout=60m -v -e "$(JUJU_ENV)" --upload-tools
+JUJUTEST = juju-test --timeout=90m -v -e "$(JUJU_ENV)" --upload-tools
 VENV = ./tests/.venv
 SYSDEPS = build-essential bzr libapt-pkg-dev python-pip python-virtualenv xvfb
 

=== modified file 'hooks/backend.py'
--- hooks/backend.py	2013-08-26 12:18:19 +0000
+++ hooks/backend.py	2013-08-30 10:38:12 +0000
@@ -254,22 +254,17 @@
         self.prev_config = prev_config
         self.mixins = []
 
-        sandbox = config['sandbox']
-        staging = config['staging']
+        is_legacy_juju = utils.legacy_juju()
 
-        if utils.legacy_juju():
-            if staging:
-                self.mixins.append(ImprovMixin())
-            elif sandbox:
-                self.mixins.append(SandboxMixin())
-            else:
-                self.mixins.append(PythonMixin())
-        else:
-            if staging:
+        if config['staging']:
+            if not is_legacy_juju:
                 raise ValueError('Unable to use staging with go backend')
-            elif sandbox:
-                raise ValueError('Unable to use sandbox with go backend')
-            self.mixins.append(GoMixin())
+            self.mixins.append(ImprovMixin())
+        elif config['sandbox']:
+            self.mixins.append(SandboxMixin())
+        else:
+            mixin = PythonMixin() if is_legacy_juju else GoMixin()
+            self.mixins.append(mixin)
 
         # We always install and start the GUI.
         self.mixins.append(GuiMixin())

=== modified file 'revision'
--- revision	2013-08-28 14:44:52 +0000
+++ revision	2013-08-30 10:38:12 +0000
@@ -1,1 +1,1 @@
-77
+78

=== modified file 'tests/20-functional.test'
--- tests/20-functional.test	2013-08-14 18:14:11 +0000
+++ tests/20-functional.test	2013-08-30 10:38:12 +0000
@@ -177,6 +177,15 @@
         # The staging environment contains five deployed services.
         self.assertSetEqual(set(STAGING_SERVICES), self.get_service_names())
 
+    def test_sandbox(self):
+        # The GUI is correctly deployed and set up in sandbox mode.
+        unit_info = self.juju_deploy(
+            self.charm, options={'builtin-server': 'true', 'sandbox': 'true'})
+        hostname = unit_info['public-address']
+        self.navigate_to(hostname)
+        self.handle_browser_warning()
+        self.assertEnvironmentIsConnected()
+
     def test_builtin_server(self):
         # Ensure the Juju GUI and builtin server are correctly set up.
         unit_info = self.juju_deploy(

=== modified file 'tests/test_backends.py'
--- tests/test_backends.py	2013-08-23 11:00:21 +0000
+++ tests/test_backends.py	2013-08-30 10:38:12 +0000
@@ -19,12 +19,12 @@
 
 from collections import defaultdict
 from contextlib import contextmanager
-import os
 import shutil
 import tempfile
 import unittest
 
 import charmhelpers
+import mock
 import shelltoolbox
 
 import backend
@@ -45,18 +45,14 @@
 class TestBackendProperties(unittest.TestCase):
     """Ensure the correct mixins and property values are collected."""
 
-    def test_staging_backend(self):
-        test_backend = backend.Backend(config={
-            'sandbox': False, 'staging': True, 'builtin-server': False})
-        mixin_names = get_mixin_names(test_backend)
-        self.assertEqual(
-            ('ImprovMixin', 'GuiMixin', 'HaproxyApacheMixin'),
-            mixin_names)
-        self.assertEqual(
-            frozenset(('apache2', 'curl', 'haproxy', 'openssl', 'zookeeper')),
-            test_backend.debs)
+    simulate_pyjuju = mock.patch(
+        'utils.legacy_juju', mock.Mock(return_value=True))
+    simulate_juju_core = mock.patch(
+        'utils.legacy_juju', mock.Mock(return_value=False))
 
-    def test_sandbox_backend(self):
+    def check_sandbox_mode(self):
+        """The backend includes the correct mixins when sandbox mode is active.
+        """
         test_backend = backend.Backend(config={
             'sandbox': True, 'staging': False, 'builtin-server': False})
         mixin_names = get_mixin_names(test_backend)
@@ -67,39 +63,68 @@
             frozenset(('apache2', 'curl', 'haproxy', 'openssl')),
             test_backend.debs)
 
+    def test_python_staging_backend(self):
+        with self.simulate_pyjuju:
+            test_backend = backend.Backend(config={
+                'sandbox': False, 'staging': True, 'builtin-server': False})
+            mixin_names = get_mixin_names(test_backend)
+            self.assertEqual(
+                ('ImprovMixin', 'GuiMixin', 'HaproxyApacheMixin'),
+                mixin_names)
+            debs = ('apache2', 'curl', 'haproxy', 'openssl', 'zookeeper')
+            self.assertEqual(frozenset(debs), test_backend.debs)
+
+    def test_go_staging_backend(self):
+        config = {'sandbox': False, 'staging': True, 'builtin-server': False}
+        with self.simulate_juju_core:
+            with self.assertRaises(ValueError) as context_manager:
+                backend.Backend(config=config)
+        error = str(context_manager.exception)
+        self.assertEqual('Unable to use staging with go backend', error)
+
+    def test_python_sandbox_backend(self):
+        with self.simulate_pyjuju:
+            self.check_sandbox_mode()
+
+    def test_go_sandbox_backend(self):
+        with self.simulate_juju_core:
+            self.check_sandbox_mode()
+
     def test_python_backend(self):
-        test_backend = backend.Backend(config={
-            'sandbox': False, 'staging': False, 'builtin-server': False})
-        mixin_names = get_mixin_names(test_backend)
-        self.assertEqual(
-            ('PythonMixin', 'GuiMixin', 'HaproxyApacheMixin'),
-            mixin_names)
-        self.assertEqual(
-            frozenset(('apache2', 'curl', 'haproxy', 'openssl')),
-            test_backend.debs)
+        with self.simulate_pyjuju:
+            test_backend = backend.Backend(config={
+                'sandbox': False, 'staging': False, 'builtin-server': False})
+            mixin_names = get_mixin_names(test_backend)
+            self.assertEqual(
+                ('PythonMixin', 'GuiMixin', 'HaproxyApacheMixin'),
+                mixin_names)
+            self.assertEqual(
+                frozenset(('apache2', 'curl', 'haproxy', 'openssl')),
+                test_backend.debs)
 
     def test_go_backend(self):
-        # Monkeypatch utils.CURRENT_DIR.
-        base_dir = tempfile.mkdtemp()
-        orig_current_dir = utils.CURRENT_DIR
-        utils.CURRENT_DIR = tempfile.mkdtemp(dir=base_dir)
-        # Create a fake agent file.
-        agent_path = os.path.join(base_dir, 'agent.conf')
-        open(agent_path, 'w').close()
-        test_backend = backend.Backend(config={
-            'sandbox': False, 'staging': False, 'builtin-server': False})
-        # Cleanup.
-        utils.CURRENT_DIR = orig_current_dir
-        shutil.rmtree(base_dir)
-        # Tests
-        mixin_names = get_mixin_names(test_backend)
-        self.assertEqual(
-            ('GoMixin', 'GuiMixin', 'HaproxyApacheMixin'),
-            mixin_names)
-        self.assertEqual(
-            frozenset(
-                ('apache2', 'curl', 'haproxy', 'openssl', 'python-yaml')),
-            test_backend.debs)
+        with self.simulate_juju_core:
+            test_backend = backend.Backend(config={
+                'sandbox': False, 'staging': False, 'builtin-server': False})
+            mixin_names = get_mixin_names(test_backend)
+            self.assertEqual(
+                ('GoMixin', 'GuiMixin', 'HaproxyApacheMixin'),
+                mixin_names)
+            self.assertEqual(
+                frozenset(
+                    ('apache2', 'curl', 'haproxy', 'openssl', 'python-yaml')),
+                test_backend.debs)
+
+    def test_builtin_server(self):
+        expected_mixins = ('GoMixin', 'GuiMixin', 'BuiltinServerMixin')
+        expected_debs = set([
+            'python-pip', 'python-yaml', 'curl', 'openssl', 'python-bzrlib'])
+        with self.simulate_juju_core:
+            test_backend = backend.Backend(config={
+                'sandbox': False, 'staging': False, 'builtin-server': True})
+            mixin_names = get_mixin_names(test_backend)
+            self.assertEqual(expected_mixins, mixin_names)
+            self.assertEqual(expected_debs, test_backend.debs)
 
 
 class TestBackendCommands(unittest.TestCase):