Merge lp:~rharding/charms/precise/juju-gui/git-ify into lp:~juju-gui/charms/precise/juju-gui/trunk

[Richard Harding]

Change juju-gui-source to be git-enabled.

- Allow pulling from various repo urls
- Support checking out a branch name
- Support checkout out a direct sha
- Remove support for the trunk releases.

The list of what you can check out is simplified a bit. You can easily use the
git access, url, or a local file in the releases directory to enable loading
the gui with any combination of code you would like to use.

Drive by removing some left over bits of the PyJuju branch previously.

QA:

  juju boostrap
  make deploy
  # make sure the gui is running off the latest release. You can check the
  # local equivelent of https://jujucharms.com/juju-ui/version.js

Run the follow config changes and after each make sure that the version is
correct for what you've requested. You can get the sha values from looking in
Github.

https://github.com/juju/juju-gui/commits/develop

  # The develop support
  juju set juju-gui juju-gui-source="develop"
  # Supports the HEAD of a branch specified.
  juju set juju-gui juju-gui-source="https://github.com/juju/juju-gui.git network-prototype"
  # Supports an older commit in the main develop line.
  juju set juju-gui juju-gui-source="https://github.com/juju/juju-gui.git @c7ddd186"

https://codereview.appspot.com/52790043/

[Richard Harding (rharding)]

Reviewers: mp+201442_code.launchpad.net,

Message:
Please take a look.

Description:
Change juju-gui-source to be git-enabled.

- Allow pulling from various repo urls
- Support checking out a branch name
- Support checkout out a direct sha
- Remove support for the trunk releases.

The list of what you can check out is simplified a bit. You can easily
use the
git access, url, or a local file in the releases directory to enable
loading
the gui with any combination of code you would like to use.

Drive by removing some left over bits of the PyJuju branch previously.

QA:

   juju boostrap
   make deploy
   # make sure the gui is running off the latest release. You can check
the
   # local equivelent of https://jujucharms.com/juju-ui/version.js

Run the follow config changes and after each make sure that the version
is
correct for what you've requested. You can get the sha values from
looking in
Github.

https://github.com/juju/juju-gui/commits/develop

   # The develop support
   juju set juju-gui juju-gui-source="develop"
   # Supports the HEAD of a branch specified.
   juju set juju-gui
juju-gui-source="https://github.com/juju/juju-gui.git network-prototype"
   # Supports an older commit in the main develop line.
   juju set juju-gui
juju-gui-source="https://github.com/juju/juju-gui.git @c7ddd186"

https://code.launchpad.net/~rharding/charms/precise/juju-gui/git-ify/+merge/201442

(do not edit description out of merge proposal)

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

Affected files (+134, -248 lines):
   M README.md
   A [revision details]
   M config.yaml
   M hooks/backend.py
   M hooks/install
   M hooks/utils.py
   M server/guiserver/auth.py
   M server/guiserver/tests/helpers.py
   M server/guiserver/tests/test_auth.py
   M tests/test_utils.py

[Richard Harding (rharding)]

Added reviewer comments

https://codereview.appspot.com/52790043/diff/60001/README.md
File README.md (left):

https://codereview.appspot.com/52790043/diff/60001/README.md#oldcode127
README.md:127: 3. Retry as described in the step 3 above (`juju resolved
--retry juju-gui/0`).
missed pyjuju cleanup.

https://codereview.appspot.com/52790043/diff/60001/README.md
File README.md (right):

https://codereview.appspot.com/52790043/diff/60001/README.md#newcode92
README.md:92: to build the source used by the charm.
this is just to reduce the duplication of what's supported. It
generalizes it a bit to read nicer.

https://codereview.appspot.com/52790043/diff/60001/config.yaml
File config.yaml (left):

https://codereview.appspot.com/52790043/diff/60001/config.yaml#oldcode24
config.yaml:24: - 'trunk': The latest release from the "trunk" series
will be deployed.
this was proven to not be used and there's so many other ways to load a
specific release now it's deemed redundant.

https://codereview.appspot.com/52790043/diff/60001/config.yaml#oldcode39
config.yaml:39: - a "url:" prefixed url: The release found at the given
URL
file:// is gone for the same reason. You can stick that file at a url,
you can put it in the releases folder, you can just point at the branch
for that file.

https://codereview.appspot.com/52790043/diff/60001/hooks/backend.py
File hooks/backend.py (right):

https://codereview.appspot.com/52790043/diff/60001/hooks/backend.py#newcode94
hooks/backend.py:94: if origin in ('branch', 'develop'):
develop is just a shortcut for the branch so it's moved up here.

https://codereview.appspot.com/52790043/diff/60001/hooks/backend.py#newcode112
hooks/backend.py:112: log('Using source {}: {}'.format(branch_url,
revision))
added some logging helpers to make sure things were doing the right
thing in QA.

https://codereview.appspot.com/52790043/diff/60001/hooks/install
File hooks/install (right):

https://codereview.appspot.com/52790043/diff/60001/hooks/install#newcode32
hooks/install:32: 'libapt-pkg-dev', 'python-apt', 'python-launchpadlib',
'python-tempita',
I hit this dep on trusty to build.

https://codereview.appspot.com/52790043/diff/60001/hooks/utils.py
File hooks/utils.py (right):

https://codereview.appspot.com/52790043/diff/60001/hooks/utils.py#newcode124
hooks/utils.py:124: git_checkout = command('git', 'clone', '--depth',
'1')
this is the equivelent shallow clone. Note, to do a revision checkout we
'undo' this later on.

https://codereview.appspot.com/52790043/diff/60001/hooks/utils.py#newcode276
hooks/utils.py:276: log('Source is defaulting to stable release.')
since this is a 'all else fails' log it to note it got hit.

https://codereview.appspot.com/52790043/diff/60001/hooks/utils.py#newcode568
hooks/utils.py:568: cmd_log(git_checkout(*checkout_args))
to do anything else we have to have a checkout. So we always checkout
the develop branch and then move on from there if a different branch or
commit was specified.

https://codereview.appspot.com/52790043/diff/60001/hooks/utils.py#newcode572
hooks/utils.py:572: git_dir = juju_gui_source_dir + "/.git"
our cwd isn't the source dir so we have to prefix the git commands with
--git-dir and --wor...

[Marco Ceppi (marcoceppi)]

Deferring to ~juju-gui

review: Abstain

[lp:~rharding/charms/precise/juju-gui/git-ify]

155. By Richard Harding on 2014-01-16

Update functional tests to test a git branch

156. By Richard Harding on 2014-01-16

Update deploy to ignore .git as well

[Richard Harding (rharding)]

Please take a look.

https://codereview.appspot.com/52790043/

[Brad Crittenden (bac)]

LGTM mit changes.
QA-A-OK

https://codereview.appspot.com/52790043/diff/60001/config.yaml
File config.yaml (right):

https://codereview.appspot.com/52790043/diff/60001/config.yaml#newcode3
config.yaml:3: # Copyright (C) 2012-2013 Canonical Ltd.
update for all files you touch.</pita>

https://codereview.appspot.com/52790043/diff/60001/hooks/install
File hooks/install (right):

https://codereview.appspot.com/52790043/diff/60001/hooks/install#newcode32
hooks/install:32: 'libapt-pkg-dev', 'python-apt', 'python-launchpadlib',
'python-tempita',
thanks for being out front. i should upgrade to trusty soon.

https://codereview.appspot.com/52790043/diff/60001/hooks/utils.py
File hooks/utils.py (right):

https://codereview.appspot.com/52790043/diff/60001/hooks/utils.py#newcode123
hooks/utils.py:123: # Bazaar checkout command.
s/Bazaar c/C/

https://codereview.appspot.com/52790043/diff/60001/hooks/utils.py#newcode124
hooks/utils.py:124: git_checkout = command('git', 'clone', '--depth',
'1')
I'd promote this review comment to a code comment. Would be useful.

https://codereview.appspot.com/52790043/diff/60001/tests/test_utils.py
File tests/test_utils.py (right):

https://codereview.appspot.com/52790043/diff/60001/tests/test_utils.py#newcode660
tests/test_utils.py:660: def test_stable_release(self, mock_log):
If you aren't going to use the mock, and there may be more, I find using
*args to be appropriate.

https://codereview.appspot.com/52790043/diff/60001/tests/test_utils.py#newcode672
tests/test_utils.py:672: # A Bazaar branch is correctly parsed when
including revision.
s/Bazaar/git/

You may want to grep the whole tree for Bazaar and bzr.

https://codereview.appspot.com/52790043/

[Richard Harding (rharding)]

Thanks for the review. Updated and re-running one final full functional
test run before landing.

https://codereview.appspot.com/52790043/

[lp:~rharding/charms/precise/juju-gui/git-ify]

157. By Richard Harding on 2014-01-16

update per review

158. By Richard Harding on 2014-01-16

Remove the master bit

159. By Richard Harding on 2014-01-16

Update test runs to take a bit to check out master

=== modified file 'Makefile'
--- Makefile	2014-01-15 14:49:19 +0000
+++ Makefile	2014-01-16 20:33:25 +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 = yes | juju-test --timeout=40m -v -e "$(JUJU_ENV)"
+JUJUTEST = yes | juju-test --timeout=60m -v -e "$(JUJU_ENV)"
 VENV = tests/.venv
 SYSDEPS = build-essential bzr libapt-pkg-dev libpython-dev python-virtualenv \
 	rsync xvfb

=== modified file 'README.md'
--- README.md	2014-01-14 23:57:37 +0000
+++ README.md	2014-01-16 20:33:25 +0000
@@ -85,16 +85,11 @@
     juju deploy juju-gui
 
 There are situations and customizations in which the charm needs to connect to
-Launchpad:
+the Internet:
 
-- juju-gui-source is set to "stable" or "trunk": in this cases the charm pulls
-  the latest stable or development release from Launchpad;
-- juju-gui-source is set to a branch (e.g. "lp:juju-gui"): in this case the
-  charm retrieves a checkout of the specified branch from Launchpad, and adds
-  an external Launchpad PPA to install build dependencies;
-- juju-gui-source is set to a specific version number not available in the
-  local store (i.e. in the releases directory of the deployed charm): in this
-  case the release is downloaded from Launchpad;
+- juju-gui-source is set to a configuration that requires accessing an
+  external source in order to fetch a release tarball or a Git checkout in order
+  to build the source used by the charm.
 - builtin-server is set to false: in this case the charm adds an external
   Launchpad PPA to install the legacy server dependencies.
 
@@ -122,10 +117,6 @@
 
     `juju resolved --retry juju-gui/0`
 
-These steps are sufficient for Juju Core.
-
-3. Retry as described in the step 3 above (`juju resolved --retry juju-gui/0`).
-
 ### Upgrading the charm behind a firewall ###
 
 When a new version of Juju GUI is released, the charm is updated to include the

=== modified file 'config.yaml'
--- config.yaml	2014-01-13 19:26:48 +0000
+++ config.yaml	2014-01-16 20:33:25 +0000
@@ -1,6 +1,6 @@
 # This file is part of the Juju GUI, which lets users view and manage Juju
 # environments within a graphical interface (https://launchpad.net/juju-gui).
-# Copyright (C) 2012-2013 Canonical Ltd.
+# Copyright (C) 2012-2014 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU Affero General Public License version 3, as published by
@@ -21,23 +21,22 @@
       - 'local' (default): The latest local release will be deployed. Releases
         are stored in the releases directory of this charm.
       - 'stable': The latest release from the "stable" series will be deployed.
-      - 'trunk': The latest release from the "trunk" series will be deployed.
-        Please note that this is not a build of the current Juju GUI trunk.
-        For that functionality, use "lp:juju-gui", as described below.
-      - a stable version (e.g '0.1.0'): The specified stable version will be
-        deployed. A suitable release is looked up in the local releases
-        repository (see the "local" choice above). If not found locally, the
-        release will be downloaded from Launchpad.
-      - a trunk version (e.g '0.1.0+build.1'): The specified trunk version
-        will be deployed. A suitable release is looked up in the local releases
-        repository (see the "local" choice above). If not found locally, the
-        release will be downloaded from Launchpad.
-      - a Bazaar branch (e.g. 'lp:juju-gui'): A release will be created and
-        deployed from the specified Bazaar branch. "http://"" prefixed branches
-        work as well. It is also possible to include the specific branch
-        revision, e.g. "lp:juju-gui:42" will checkout revno 42.
-      - a "url:" prefixed url: The release found at the given URL
-        (ex: url:http://... or url:file://...) will be deployed.
+      - 'develop': The latest, in development, version from the Git repository.
+      - a specific release version (e.g '0.1.0' or '0.1.0+build.1'): The
+        specified stable version will be deployed. A suitable release is
+        looked up in the local releases repository (see the "local" choice
+        above). If not found locally, the release will be downloaded from
+        Launchpad.
+      - a Git branch (e.g. 'https://github.com/juju/juju-gui.git' or
+        'https://github.com/mitechie/juju-gui.git updated-test-runner'): A
+        release will be created and deployed from the specified Git
+        repository. You can include a branch name or a specific commit SHA
+        after the url to the Git repository to deploy that specific commit
+        point. You may instead specify a commit SHA: (e.g.
+        'https://github.com/mitechie/juju-gui.git @de5e61bf9fa') which will
+        clone the git repository and then check out the specified commit
+        before building the release.
+      - a URL: The release found at the given URL (ex: http://...) will be deployed.
     type: string
     default: local
   juju-gui-debug:

=== modified file 'hooks/backend.py'
--- hooks/backend.py	2014-01-13 19:26:48 +0000
+++ hooks/backend.py	2014-01-16 20:33:25 +0000
@@ -91,7 +91,14 @@
             # Get a tarball somehow.
             origin, version_or_branch = utils.parse_source(
                 backend.config['juju-gui-source'])
-            if origin == 'branch':
+            if origin in ('branch', 'develop'):
+                # Develop is the latest passing build from Git.
+                if origin == 'develop':
+                    version_or_branch = (
+                        'https://github.com/juju/juju-gui.git',
+                        None
+                    )
+
                 logpath = backend.config['command-log-file']
                 # Make sure we have the required build dependencies.
                 # Note that we also need to add the juju-gui repository
@@ -100,7 +107,10 @@
                 utils.install_missing_packages(
                     utils.DEB_BUILD_DEPENDENCIES,
                     repository=backend.config['repository-location'])
+
                 branch_url, revision = version_or_branch
+                log('Using source {}: {}'.format(branch_url, revision))
+
                 release_tarball_path = utils.fetch_gui_from_branch(
                     branch_url, revision, logpath)
             else:

=== modified file 'hooks/install'
--- hooks/install	2013-11-13 18:37:07 +0000
+++ hooks/install	2014-01-16 20:33:25 +0000
@@ -3,7 +3,7 @@
 
 # This file is part of the Juju GUI, which lets users view and manage Juju
 # environments within a graphical interface (https://launchpad.net/juju-gui).
-# Copyright (C) 2012-2013 Canonical Ltd.
+# Copyright (C) 2012-2014 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU Affero General Public License version 3, as published by
@@ -29,7 +29,9 @@
 # Python dependencies must be installed here so that the charm can import and
 # use required libraries.
 PYTHON_DEPENDENCIES = (
-    'python-apt', 'python-launchpadlib', 'python-tempita', 'python-yaml')
+    'libapt-pkg-dev', 'python-apt', 'python-launchpadlib', 'python-tempita',
+    'python-yaml'
+)
 
 run('juju-log', '--', 'Installing base Python dependencies: {}.'.format(
     ', '.join(PYTHON_DEPENDENCIES)))

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2014-01-15 12:03:24 +0000
+++ hooks/utils.py	2014-01-16 20:33:25 +0000
@@ -1,6 +1,6 @@
 # This file is part of the Juju GUI, which lets users view and manage Juju
 # environments within a graphical interface (https://launchpad.net/juju-gui).
-# Copyright (C) 2012-2013 Canonical Ltd.
+# Copyright (C) 2012-2014 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU Affero General Public License version 3, as published by
@@ -81,7 +81,6 @@
 from shelltoolbox import (
     apt_get_install,
     command,
-    environ,
     install_extra_repositories,
     run,
     script_name,
@@ -115,21 +114,17 @@
 
 JUJU_PEM = 'juju.includes-private-key.pem'
 DEB_BUILD_DEPENDENCIES = (
-    'bzr', 'g++', 'imagemagick', 'make',  'nodejs', 'npm',
+    'bzr', 'g++', 'git', 'imagemagick', 'make',  'nodejs', 'npm',
 )
 
 
 # Store the configuration from on invocation to the next.
 config_json = Serializer(os.path.join(os.path.sep, 'tmp', 'config.json'))
-# Bazaar checkout command.
-bzr_checkout = command('bzr', 'co', '--lightweight')
+# Git checkout command.
+# This is the equivalent shallow clone. Note, to do a revision checkout we
+# 'undo' this later on.
+git_checkout = command('git', 'clone', '--depth', '1')
 
-bzr_url_expression = re.compile(r"""
-    ^  # Beginning of line.
-    ((?:lp:|http:\/\/)[^:]+)  # Branch URL (scheme + domain/path).
-    (?::(\d+))?  # Optional branch revision.
-    $  # End of line.
-""", re.VERBOSE)
 release_expression = re.compile(r"""
     juju-gui-  # Juju GUI prefix.
     (
@@ -240,29 +235,47 @@
     Examples:
        - ('local', None): latest local release;
        - ('stable', None): latest stable release;
-       - ('stable', '0.1.0'): stable release v0.1.0;
-       - ('trunk', None): latest trunk release;
-       - ('trunk', '0.1.0+build.1'): trunk release v0.1.0 bzr revision 1;
-       - ('branch', ('lp:juju-gui', 42): release is made from a branch -
-         in this case the second element includes the branch URL and revision;
-       - ('branch', ('lp:juju-gui', None): no revision is specified;
-       - ('url', 'http://example.com/gui'): release from a downloaded file.
+       - ('develop', None): latest build from git trunk;
+       - ('release', '0.1.0'): release v0.1.0;
+       - ('branch', ('https://github.com/juju/juju-gui.git', 'add-feature'):
+         release is made from a branch -
+         in this case the second element includes the branch or SHA;
+       - ('branch', ('https://github.com/juju/juju-gui.git', None): no
+         revision is specified;
+       - ('url', 'http://example.com/gui.tar.gz'): release from a downloaded
+         file.
     """
-    if source.startswith('url:'):
-        source = source[4:]
-        # Support file paths, including relative paths.
-        if urlparse.urlparse(source).scheme == '':
-            if not source.startswith('/'):
-                source = os.path.join(os.path.abspath(CURRENT_DIR), source)
-            source = "file://%s" % source
+
+    def is_url(url_check):
+        if ' ' in url_check:
+            url_check, _ = url_check.split(' ')
+
+        if url_check.startswith('http') and not url_check.endswith('.git'):
+            return True
+        else:
+            return False
+
+    def is_branch(check_branch):
+        target = None
+        if ' ' in check_branch:
+            check_branch, target = check_branch.split(' ')
+
+        if check_branch.startswith('http') and check_branch.endswith('.git'):
+            return (check_branch, target)
+        else:
+            return False
+
+    if is_url(source):
         return 'url', source
-    if source in ('local', 'stable', 'trunk'):
+
+    if source in ('local', 'stable', 'develop'):
         return source, None
-    match = bzr_url_expression.match(source)
-    if match is not None:
-        return 'branch', match.groups()
-    if 'build' in source:
-        return 'trunk', source
+
+    check_branch = is_branch(source)
+    if (check_branch):
+        return ('branch', check_branch)
+
+    log('Source is defaulting to stable release.')
     return 'stable', source
 
 
@@ -545,22 +558,49 @@
     """Retrieve the Juju GUI from a branch and build a release archive."""
     # Inject NPM packages into the cache for faster building.
     prime_npm_cache(get_npm_cache_archive_url())
+
     # Create a release starting from a branch.
     juju_gui_source_dir = os.path.join(CURRENT_DIR, 'juju-gui-source')
-    checkout_args, revno = ([], 'latest revno') if revision is None else (
-        ['--revision', revision], 'revno {}'.format(revision))
+
     log('Retrieving Juju GUI source checkout from {} ({}).'.format(
-        branch_url, revno))
+        branch_url, revision))
+
     cmd_log(run('rm', '-rf', juju_gui_source_dir))
-    checkout_args.extend([branch_url, juju_gui_source_dir])
-    cmd_log(bzr_checkout(*checkout_args))
+    checkout_args = [branch_url, juju_gui_source_dir]
+    cmd_log(git_checkout(*checkout_args))
+
+    # If there's a revision attempt to checkout that revision.
+    if revision:
+        git_dir = juju_gui_source_dir + "/.git"
+        if revision.startswith('@'):
+            revision = revision[1:]
+            # We have to unshallow the checkout in order to be able to 'see'
+            # older commit hashes to check them out.
+            cmd_log(run(
+                'git', '--git-dir', git_dir, '--work-tree',
+                juju_gui_source_dir, 'fetch', '--depth', '20000'))
+
+            cmd_log(run(
+                'git', '--git-dir', git_dir, '--work-tree',
+                juju_gui_source_dir, 'checkout', revision))
+        else:
+            cmd_log(run(
+                'git', '--git-dir', git_dir, '--work-tree',
+                juju_gui_source_dir, 'fetch', 'origin'))
+            cmd_log(run(
+                'git', '--git-dir', git_dir, '--work-tree',
+                juju_gui_source_dir, 'checkout', '-b', revision,
+                'origin/' + revision))
+
     log('Preparing a Juju GUI release.')
     logdir = os.path.dirname(logpath)
+
     fd, name = tempfile.mkstemp(prefix='make-distfile-', dir=logdir)
     log('Output from "make distfile" sent to %s' % name)
-    with environ(NO_BZR='1'):
-        run('make', '-C', juju_gui_source_dir, 'distfile',
-            stdout=fd, stderr=fd)
+
+    run('make', '-C', juju_gui_source_dir, 'distfile', 'BRANCH_IS_GOOD=true',
+        stdout=fd, stderr=fd)
+
     return first_path_in_dir(
         os.path.join(juju_gui_source_dir, 'releases'))
 
@@ -623,7 +663,7 @@
         path = get_release_file_path()
         log('Using a local release: {}'.format(path))
         return path
-    # Handle "stable" and "trunk" origins.
+    # Handle "stable"
     if version is not None:
         # If the user specified a version, before attempting to download the
         # requested release from Launchpad, check if that version is already

=== modified file 'server/guiserver/auth.py'
--- server/guiserver/auth.py	2013-11-25 14:02:15 +0000
+++ server/guiserver/auth.py	2014-01-16 20:33:25 +0000
@@ -20,7 +20,7 @@
 
     - User: this is a simple data structure representing a logged in or
       anonymous user.
-    - Authentication backends (GoBackend and PythonBackend): the primary
+    - Authentication backends (GoBackend): the primary
       purpose of auth backends is to provide the logic to parse requests' data
       based on the API implementation currently in use. They can also be used
       to create authentication requests.  They must implement the following
@@ -212,69 +212,9 @@
             Params=dict(AuthTag=username, Password=password))
 
 
-class PythonBackend(object):
-    """Authentication backend for the Juju Python implementation.
-
-    A login request looks like the following:
-
-        {
-            'request_id': 42,
-            'op': 'login',
-            'user': 'admin',
-            'password': 'ADMIN-SECRET',
-        }
-
-    A successful login response includes these fields:
-
-        {
-            'request_id': 42,
-            'op': 'login',
-            'user': 'admin',
-            'password': 'ADMIN-SECRET',
-            'result': True,
-        }
-
-    A login failure response is like the following:
-
-        {
-            'request_id': 42,
-            'op': 'login',
-            'user': 'admin',
-            'password': 'ADMIN-SECRET',
-            'err': True,
-        }
-    """
-
-    def get_request_id(self, data):
-        """Return the request identifier associated with the provided data."""
-        return data.get('request_id')
-
-    def request_is_login(self, data):
-        """Return True if data represents a login request, False otherwise."""
-        op = data.get('op')
-        return (op == 'login') and ('user' in data) and ('password' in data)
-
-    def get_credentials(self, data):
-        """Parse the provided login data and return username and password."""
-        return data['user'], data['password']
-
-    def login_succeeded(self, data):
-        """Return True if data represents a successful login, False otherwise.
-        """
-        return data.get('result') and not data.get('err')
-
-    def make_request(self, request_id, username, password):
-        """Create and return an authentication request."""
-        return dict(
-            request_id=request_id,
-            op='login',
-            user=username,
-            password=password)
-
-
 def get_backend(apiversion):
     """Return the auth backend instance to use for the given API version."""
-    backend_class = {'go': GoBackend, 'python': PythonBackend}[apiversion]
+    backend_class = {'go': GoBackend}[apiversion]
     return backend_class()
 
 

=== modified file 'server/guiserver/tests/helpers.py'
--- server/guiserver/tests/helpers.py	2013-11-22 22:26:20 +0000
+++ server/guiserver/tests/helpers.py	2014-01-16 20:33:25 +0000
@@ -107,44 +107,6 @@
             Params={'Token': token})
 
 
-class PythonAPITestMixin(object):
-    """Add helper methods for testing the Python API implementation."""
-
-    def get_auth_backend(self):
-        """Return an authentication backend suitable for the Python API."""
-        return auth.get_backend('python')
-
-    def make_login_request(
-            self, request_id=42, username='user', password='passwd',
-            encoded=False):
-        """Create and return a login request message.
-
-        If encoded is set to True, the returned message will be JSON encoded.
-        """
-        data = {
-            'request_id': request_id,
-            'op': 'login',
-            'user': username,
-            'password': password,
-        }
-        return json.dumps(data) if encoded else data
-
-    def make_login_response(
-            self, request_id=42, successful=True, encoded=False):
-        """Create and return a login response message.
-
-        If encoded is set to True, the returned message will be JSON encoded.
-        By default, a successful response is returned. Set successful to False
-        to return an authentication failure.
-        """
-        data = {'request_id': request_id, 'op': 'login'}
-        if successful:
-            data['result'] = True
-        else:
-            data['err'] = True
-        return json.dumps(data) if encoded else data
-
-
 class BundlesTestMixin(object):
     """Add helper methods for testing the GUI server bundles support."""
 

=== modified file 'server/guiserver/tests/test_auth.py'
--- server/guiserver/tests/test_auth.py	2013-11-28 16:43:00 +0000
+++ server/guiserver/tests/test_auth.py	2014-01-16 20:33:25 +0000
@@ -204,12 +204,6 @@
         self.assert_user('', '', False)
 
 
-class TestPythonAuthMiddleware(
-        helpers.PythonAPITestMixin, AuthMiddlewareTestMixin,
-        LogTrapTestCase, unittest.TestCase):
-    pass
-
-
 class BackendTestMixin(object):
     """Include tests for the authentication backends.
 
@@ -288,35 +282,6 @@
             self.assertFalse(is_login, request)
 
 
-class TestPythonBackend(
-        helpers.PythonAPITestMixin, BackendTestMixin, unittest.TestCase):
-
-    def test_request_is_not_login(self):
-        # False is returned if the passed data is not a login request.
-        requests = (
-            {},
-            {
-                'request_id': 42,
-                'op': 'INVALID',
-                'user': 'user',
-                'password': 'passwd',
-            },
-            {
-                'request_id': 42,
-                'op': 'login',
-                'password': 'passwd',
-            },
-            {
-                'request_id': 42,
-                'op': 'login',
-                'user': 'user',
-            },
-        )
-        for request in requests:
-            is_login = self.backend.request_is_login(request)
-            self.assertFalse(is_login, request)
-
-
 class TestAuthenticationTokenHandler(LogTrapTestCase, unittest.TestCase):
 
     def setUp(self):

=== modified file 'tests/20-functional.test'
--- tests/20-functional.test	2014-01-15 14:49:19 +0000
+++ tests/20-functional.test	2014-01-16 20:33:25 +0000
@@ -40,7 +40,8 @@
 )
 import example
 
-JUJU_GUI_TEST_BRANCH = 'lp:~juju-gui/juju-gui/charm-tests-branch'
+JUJU_GUI_TEST_BRANCH = 'https://github.com/juju/juju-gui.git master'
+
 try:
     admin_secret = get_admin_secret()
 except ValueError as err:
@@ -193,7 +194,7 @@
         self.assertTrue(server_info['sandbox'])
 
     def test_branch_source(self):
-        # Ensure the Juju GUI is correctly deployed from a Bazaar branch.
+        # Ensure the Juju GUI is correctly deployed from a Git branch.
         options = {'juju-gui-source': JUJU_GUI_TEST_BRANCH}
         self.service_name, unit_info, _ = juju_deploy_gui(options=options)
         hostname = unit_info['public-address']

=== modified file 'tests/deploy.py'
--- tests/deploy.py	2013-11-27 14:37:06 +0000
+++ tests/deploy.py	2014-01-16 20:33:25 +0000
@@ -33,14 +33,17 @@
 )
 
 
-rsync = command('rsync', '-a', '--exclude', '.bzr', '--exclude', '/tests')
+rsync = command('rsync', '-a',
+                '--exclude', '.git',
+                '--exclude', '.bzr',
+                '--exclude', '/tests')
 
 
 def setup_repository(name, source, series='precise'):
     """Create a temporary Juju repository to use for charm deployment.
 
     Copy the charm files in source in the precise repository section, using the
-    provided charm name and excluding the virtualenv and Bazaar directories.
+    provided charm name and excluding the virtualenv and Git directories.
 
     Return the repository path.
     """

=== modified file 'tests/test_deploy.py'
--- tests/test_deploy.py	2013-11-27 14:37:06 +0000
+++ tests/test_deploy.py	2014-01-16 20:33:25 +0000
@@ -51,10 +51,6 @@
         self.addCleanup(shutil.rmtree, self.source)
         # Create a file in the source dir.
         _, self.root_file = tempfile.mkstemp(dir=self.source)
-        # Create a Bazaar repository directory with a file in it.
-        bzr_dir = os.path.join(self.source, '.bzr')
-        os.mkdir(bzr_dir)
-        tempfile.mkstemp(dir=bzr_dir)
         # Create a tests directory including a .venv directory and a file.
         self.tests_dir = os.path.join(self.source, 'tests')
         venv_dir = os.path.join(self.tests_dir, '.venv')

=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2014-01-15 12:03:24 +0000
+++ tests/test_utils.py	2014-01-16 20:33:25 +0000
@@ -1,6 +1,6 @@
 # This file is part of the Juju GUI, which lets users view and manage Juju
 # environments within a graphical interface (https://launchpad.net/juju-gui).
-# Copyright (C) 2012-2013 Canonical Ltd.
+# Copyright (C) 2012-2014 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU Affero General Public License version 3, as published by
@@ -368,7 +368,7 @@
         self.add('juju-gui-1.2.3.4.tgz')  # Wrong version.
         self.add('juju-gui-1.2.3.build.42.tgz')  # Missing "+" separator.
         self.add('juju-gui-1.2.3+built.42.tgz')  # Typo.
-        self.add('juju-gui-1.2.3+build.42.47.tgz')  # Invalid bzr revno.
+        self.add('juju-gui-1.2.3+build.42.47.tgz')  # Invalid revno.
         self.add('juju-gui-1.2.3+build.42.bz2')  # Wrong file extension again.
         with self.mock_releases_dir():
             with self.assert_error():
@@ -507,12 +507,6 @@
         self.assertEqual('http://example.com/0.1.1.tgz', url)
         self.assertEqual('0.1.1.tgz', name)
 
-    def test_latest_trunk_release(self):
-        # Ensure the correct URL is returned for the latest trunk release.
-        url, name = get_launchpad_release(self.project, 'trunk', None)
-        self.assertEqual('http://example.com/0.1.1+build.1.tgz', url)
-        self.assertEqual('0.1.1+build.1.tgz', name)
-
     def test_specific_stable_release(self):
         # Ensure the correct URL is returned for a specific version of the
         # stable release.
@@ -520,14 +514,6 @@
         self.assertEqual('http://example.com/0.1.0.tgz', url)
         self.assertEqual('0.1.0.tgz', name)
 
-    def test_specific_trunk_release(self):
-        # Ensure the correct URL is returned for a specific version of the
-        # trunk release.
-        url, name = get_launchpad_release(
-            self.project, 'trunk', '0.1.0+build.1')
-        self.assertEqual('http://example.com/0.1.0+build.1.tgz', url)
-        self.assertEqual('0.1.0+build.1.tgz', name)
-
     def test_series_not_found(self):
         # A ValueError is raised if the series cannot be found.
         with self.assertRaises(ValueError) as cm:
@@ -665,47 +651,38 @@
         expected = ('stable', None)
         self.assertTupleEqual(expected, parse_source('stable'))
 
-    def test_latest_trunk_release(self):
-        # Ensure the latest trunk release is correctly parsed.
-        expected = ('trunk', None)
-        self.assertTupleEqual(expected, parse_source('trunk'))
+    def test_latest_develop_release(self):
+        # Ensure the latest develop branch release is correctly parsed.
+        expected = ('develop', None)
+        self.assertTupleEqual(expected, parse_source('develop'))
 
-    def test_stable_release(self):
+    @mock.patch('utils.log')
+    def test_stable_release(self, *args):
         # Ensure a specific stable release is correctly parsed.
         expected = ('stable', '0.1.0')
         self.assertTupleEqual(expected, parse_source('0.1.0'))
 
-    def test_trunk_release(self):
-        # Ensure a specific trunk release is correctly parsed.
-        expected = ('trunk', '0.1.0+build.1')
-        self.assertTupleEqual(expected, parse_source('0.1.0+build.1'))
-
-    def test_bzr_branch(self):
-        # Ensure a Bazaar branch is correctly parsed.
-        sources = ('lp:example', 'http://bazaar.launchpad.net/example')
-        for source in sources:
-            expected = ('branch', (source, None))
-            self.assertEqual(expected, parse_source(source))
-
-    def test_bzr_branch_and_revision(self):
-        # A Bazaar branch is correctly parsed when including revision.
-        sources = ('lp:example:42', 'http://bazaar.launchpad.net/example:1')
-        for source in sources:
-            expected = ('branch', tuple(source.rsplit(':', 1)))
+    def test_git_branch(self):
+        # Ensure a Git branch is correctly parsed.
+        source = 'https://github.com/juju/juju-gui.git'
+        expected = ('branch', (source, None))
+        self.assertEqual(expected, parse_source(source))
+
+    def test_git_branch_and_revision(self):
+        # A Git branch is correctly parsed when including revision.
+        sources = (
+            'https://github.com/juju/juju-gui.git test_feature',
+            'https://github.com/juju/juju-gui.git @de5e6',
+        )
+
+        for source in sources:
+            expected = ('branch', tuple(source.rsplit(' ', 1)))
             self.assertEqual(expected, parse_source(source))
 
     def test_url(self):
         expected = ('url', 'http://example.com/gui')
         self.assertTupleEqual(
-            expected, parse_source('url:http://example.com/gui'))
-
-    def test_file_url(self):
-        expected = ('url', 'file:///foo/bar')
-        self.assertTupleEqual(expected, parse_source('url:/foo/bar'))
-
-    def test_relative_file_url(self):
-        expected = ('url', 'file:///current/dir/foo/bar')
-        self.assertTupleEqual(expected, parse_source('url:foo/bar'))
+            expected, parse_source('http://example.com/gui'))
 
 
 class TestRenderToFile(unittest.TestCase):