Merge lp:~bac/lpsetup/fix-inithost-install-lxc into lp:lpsetup

[Brad Crittenden]

Fix install-lxc and finish-init-host.

A previous branch refactored away some methods that install-lxc and finish-init-host needed. Those commands were neutered and their tests disabled.

This branch fixes them properly. Some stuff from finish-init-host was moved to init-host so that everything in the latter stage all depend upon a Launchpad tree existing.

I poked and prodded setup.cfg and with Francesco's help got a work-around that seems to appease nose.

[Brad Crittenden (bac)]

A run of install-lxc is currently under test in a clean precise VM.

[lp:~bac/lpsetup/fix-inithost-install-lxc]

54. By Brad Crittenden on 2012-07-11

Fix fatal typo

55. By Brad Crittenden on 2012-07-11

Don't error if launchpad repo already exists

56. By Brad Crittenden on 2012-07-11

Fix typo

[Gary Poster (gary)]

Hi Brad. Thank you, this looks very good.

I believe the make_launchpad is called only once, with install=True. This suggests that we could remove that argument from the signature; and it further suggests that we could maybe collapse it into setup_launchpad. Take that as far as you feel comfortable.

I think it would be nice if finish-inithost had a docstring (and help text?) that indicated that it was slated for eventual removal.

The only "must-have" change I have is that install_lxc should not include inithost.SubCommand.initialize_lxc_step. That is run in the lxc container for this story, when we run setup_lxc (which calls inithost in the container). We should not run it in the lxc host.

Thanks again!

Gary

review: Approve

[Gary Poster (gary)]

Brad and I talked further. install-lxc still needs some more refactoring. he'll circle around and finish that up.

review: Needs Fixing

[lp:~bac/lpsetup/fix-inithost-install-lxc]

57. By Brad Crittenden on 2012-07-12

Added notes on broken install-lxc

58. By Brad Crittenden on 2012-07-12

checkpoint

59. By Brad Crittenden on 2012-07-12

Fixes to install_lxc.

60. By Brad Crittenden on 2012-07-12

Finish up install-lxc and make changes due to testing. Made command-line options unique.

[Brad Crittenden (bac)]

Gary please look at this again.

[Gary Poster (gary)]

Wow, thank you Brad. This is great. Everything from the code cleanup, to the code reduction, to the help & doc text improvements are really wonderful.

Could you please make a card, or a quick branch, to have handle_directories use os.path.abspath so we can pass directories like '.'?

The help for the user argument of finish-init-host does not make sense right now. Could you arrange for it to be adjusted to remove references to creating a user, unless you disagree?

review: Approve

[Francesco Banconi (frankban)]

Gary wrote:
> Could you please make a card, or a quick branch, to have handle_directories use os.path.abspath
> so we can pass directories like '.'?

Yesterday I made this change in the branch I am currently working on: I thought that being able to pass relative paths (e.g. to init-repo) is a really nice thing to have.

[Brad Crittenden (bac)]

Thanks Gary.
Changes being made in a different branch and merge proposal.

=== modified file 'README.rst'
--- README.rst	2012-07-10 20:00:37 +0000
+++ README.rst	2012-07-12 22:14:19 +0000
@@ -11,7 +11,14 @@
 ~~~~~~~~~~~~
 
 lp-setup requires:
-Python >= 2.7, `python-shelltoolbox`, and `pep8`.
+  lxc
+  Python >= 2.7
+  pep8
+  python-shelltoolbox
+  python-pocket-lint
+  python-nose
+  python-coverage (optional)
+
 The package `python-argparse` is required to run lp-setup using Python 2.6.
 
 
@@ -40,8 +47,10 @@
 
 To run *lpsetup* tests install nose and run `nosetests` from this directory::
 
-    apt-get install python-nose
+    apt-get install python-nose python-coverage
     nosetests
+    or
+    ./pre-commit.sh
 
 
 Integration tests
@@ -69,7 +78,6 @@
 
 Install pocketlint::
 
-    sudo apt-add-repository ppa:sinzui/ppa
     sudo apt-get update
     sudo apt-get install python-pocket-lint
 

=== modified file 'lplxcip/tests/utils.py'
--- lplxcip/tests/utils.py	2012-05-03 14:20:13 +0000
+++ lplxcip/tests/utils.py	2012-07-12 22:14:19 +0000
@@ -87,7 +87,7 @@
             '-n', self.name,
             '-f', self._write_config(),
             '--',
-            '-r {} -a {}'.format(self.release, self.arch)
+            '-R {} -a {}'.format(self.release, self.arch),
             ]
         return self._call(cmd)
 

=== modified file 'lpsetup/handlers.py'
--- lpsetup/handlers.py	2012-07-10 18:11:30 +0000
+++ lpsetup/handlers.py	2012-07-12 22:14:19 +0000
@@ -220,18 +220,21 @@
 
 
 def handle_directories(namespace):
-    """Handle checkout and dependencies directories.
+    """Handle repository, code_dir, and dependencies directories.
 
     - The ~ construction is automatically expanded.
     - The validation fails for directories not residing inside the home.
     - The validation fails if the directory contains spaces.
     """
-    if ' ' in namespace.repository:
-        raise ValidationError('argument directory can not contain spaces.')
-    for attr in ('repository', 'dependencies_dir'):
+    for attr in ('repository', 'code_dir', 'dependencies_dir'):
         directory = getattr(namespace, attr, None)
         if directory is None:
             continue
+        if ' ' in directory:
+            err = ("argument directory cannot contain "
+                   "spaces: '{0}'".format(directory))
+            raise ValidationError(err)
+
         directory = directory.replace('~', namespace.home_dir)
         if not directory.startswith(namespace.home_dir + os.path.sep):
             raise ValidationError(

=== modified file 'lpsetup/settings.py'
--- lpsetup/settings.py	2012-07-10 15:50:26 +0000
+++ lpsetup/settings.py	2012-07-12 22:14:19 +0000
@@ -3,6 +3,7 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Global settings and defaults for lpsetup."""
+import os.path
 
 
 APT_REPOSITORIES = (
@@ -53,12 +54,13 @@
     }
 LP_BRANCH_NAME = 'devel'
 LP_CHECKOUT_NAME = 'sandbox'
+LP_CODE_DIR = os.path.join(CHECKOUT_DIR, LP_CHECKOUT_NAME)
 LP_PACKAGES = [
     # "launchpad-database-dependencies-9.1" can be removed once 8.x is
     # no longer an option in "launchpad-developer-dependencies.
     'launchpad-database-dependencies-9.1',
     'launchpad-developer-dependencies', 'apache2',
-    'apache2-mpm-worker', 'libapache2-mod-wsgi'
+    'apache2-mpm-worker', 'libapache2-mod-wsgi',
     ]
 LP_HTTP_REPO = 'http://bazaar.launchpad.net/~launchpad-pqm/launchpad/devel'
 LP_SSH_REPO = 'lp:launchpad'

=== modified file 'lpsetup/subcommands/finish_inithost.py'
--- lpsetup/subcommands/finish_inithost.py	2012-07-10 15:41:13 +0000
+++ lpsetup/subcommands/finish_inithost.py	2012-07-12 22:14:19 +0000
@@ -7,11 +7,12 @@
 Perform all tasks required to be run to initialize a Launchpad development
 host that need to be done 1) after the Launchpad tree has been retrieved and
 2) run as root.
+
+This subcommand is slated for eventual removal.
 """
 
 __metaclass__ = type
 __all__ = [
-    'setup_bzr_locations_as_root',
     'setup_launchpad',
     'SubCommand',
     ]
@@ -19,7 +20,6 @@
 from contextlib import nested
 import os
 import pwd
-import subprocess
 
 from shelltoolbox import (
     cd,
@@ -27,116 +27,70 @@
     su,
     )
 
-from lpsetup.handlers import handle_directories
-from lpsetup.subcommands import (
-    inithost,
-    initrepo,
-    )
-from lpsetup.settings import (
-    CHECKOUT_DIR,
-    DEPENDENCIES_DIR,
-    LP_BRANCH_NAME,
-    )
+from lpsetup import argparser
+from lpsetup.handlers import (
+    handle_directories,
+    handle_user,
+    )
+from lpsetup.settings import LP_CODE_DIR
 from lpsetup.utils import call
 
 
-def make_launchpad(user, checkout_dir, install=False):
-    """Make and optionally install Launchpad."""
-    # Using real su because mailman make script uses uid.
-    call(*get_su_command(user, ['make', '-C', checkout_dir]))
-    if install:
-        call('make', '-C', checkout_dir, 'install')
-
-
-def setup_external_sourcecode(
-    user, sandbox_dir, checkout_dir, dependencies_dir, valid_ssh_keys=True):
-    """Update and link external sourcecode."""
-    cmd = (
-        'utilities/update-sourcecode',
-        None if valid_ssh_keys else '--use-http',
-        os.path.join(dependencies_dir, 'sourcecode'),
-        )
-    if os.path.exists(sandbox_dir):
-        build_dir = sandbox_dir
-    elif os.path.exists(checkout_dir):
-        build_dir = checkout_dir
-
-    with cd(build_dir):
-        # Using real su because update-sourcecode uses uid.
-        call(*get_su_command(user, cmd))
-        with su(user):
-            call('utilities/link-external-sourcecode', dependencies_dir)
-
-
-def setup_launchpad(user, dependencies_dir, repository, valid_ssh_keys):
+def setup_launchpad(user, code_dir):
     """Set up the Launchpad environment."""
-    # User configuration.
-    subprocess.call(['adduser', user, 'sudo'])
-    pwd_database = pwd.getpwnam(user)
-    subprocess.call(['addgroup', '--gid', str(pwd_database.pw_gid), user])
-    # Set up Launchpad dependencies.
-    # XXX: Eventually move to 'update'.
-    checkout_dir = os.path.join(repository, LP_BRANCH_NAME)
-    setup_external_sourcecode(
-        user, checkout_dir, dependencies_dir, valid_ssh_keys)
 
     # Launchpad database setup.
     # nested is required for use by python 2.6.
-    with nested(su(user), cd(checkout_dir)):
+    with nested(su(user), cd(code_dir)):
         call('utilities/launchpad-database-setup', user)
 
     # Make and install launchpad.
-    make_launchpad(user, checkout_dir, install=True)
+    with cd(code_dir):
+        # Using real su because mailman make script uses uid.
+        call(*get_su_command(user, ['make', 'schema']))
+        call('make', 'install')
 
     # Change owner of /srv/launchpad.dev/.
+    pwd_database = pwd.getpwnam(user)
     os.chown('/srv/launchpad.dev/', pwd_database.pw_uid, pwd_database.pw_gid)
 
 
-def setup_bzr_locations_as_root(user, lpuser, repository):
-    with su(user):
-        initrepo.setup_bzr_locations(lpuser, repository)
-
-
-class SubCommand(inithost.SubCommand):
-    """Finish the initialization of a Launchpad development host."""
-
-    # The steps for "install" are a superset of the steps for "inithost".
+class SubCommand(argparser.StepsBasedSubCommand):
+    """Finish the initialization of a Launchpad development host.
+
+    Run the commands as root in the Launchpad target machine that must be done
+    after the Launchpad tree is available.
+
+    This subcommand is slated for eventual removal.
+    """
 
     help = __doc__
 
-    @property
-    def steps(self):
-        # Break import loop (and break it here because this subcommand is
-        # going away soon).
-        import install_lxc
-        return (
-            inithost.SubCommand.initialize_step,
-            install_lxc.SubCommand.fetch_step,
-            (setup_bzr_locations_as_root,
-             'user', 'lpuser', 'repository'),
-            inithost.SubCommand.setup_apt_step,
-            (setup_launchpad,
-            'user', 'dependencies_dir', 'repository', 'valid_ssh_keys'),
-            )
-
-    def get_handlers(self, namespace):
-        handlers = super(SubCommand, self).get_handlers(namespace)
-        return handlers + (handle_directories,)
+    needs_root = True
+
+    steps = (
+        (setup_launchpad, 'user', 'code_dir'),
+        )
+
+    handlers = (
+        handle_user,
+        handle_directories,
+        )
+
+    @staticmethod
+    def add_common_arguments(parser):
+        parser.add_argument(
+            '-c', '--code-dir', default=LP_CODE_DIR,
+            help='The directory of the Launchpad code checkout.  '
+                 'The directory must reside under the home directory of the '
+                 'given user (see -u argument). '
+                 '[DEFAULT={0}]'.format(LP_CODE_DIR))
 
     def add_arguments(self, parser):
         super(SubCommand, self).add_arguments(parser)
-        parser.add_argument(
-            '-d', '--dependencies-dir', default=DEPENDENCIES_DIR,
-            help='The directory of the Launchpad dependencies to be created. '
-                 'The directory must reside under the home directory of the '
-                 'given user (see -u argument). '
-                 '[DEFAULT={0}]'.format(DEPENDENCIES_DIR))
-        parser.add_argument(
-            '-r', '--repository', default=CHECKOUT_DIR,
-            help='The directory of the Launchpad repository to be created. '
-                 'The directory must reside under the home directory of the '
-                 'given user (see -u argument). '
-                 '[DEFAULT={0}]'.format(CHECKOUT_DIR))
-        parser.add_argument(
-            '-t', '--with-trees', action='store_false', dest='lightweight',
-            default=True, help='Do not use a lightweight checkout.')
+        self.add_common_arguments(parser)
+        parser.add_argument(
+            '-u', '--user',
+            help='The name of the system user to be created or updated. '
+                 'The current user is used if this script is not run as '
+                 'root and this argument is omitted.')

=== modified file 'lpsetup/subcommands/inithost.py'
--- lpsetup/subcommands/inithost.py	2012-07-11 11:25:22 +0000
+++ lpsetup/subcommands/inithost.py	2012-07-12 22:14:19 +0000
@@ -14,6 +14,7 @@
 
 from email.Utils import formataddr
 import os
+import pwd
 import shutil
 import subprocess
 
@@ -109,6 +110,12 @@
     if not user_exists(user):
         call('useradd', '-m', '-s', '/bin/bash', '-U', user)
 
+    # Add user to the sudo group.
+    subprocess.call(['adduser', user, 'sudo'])
+    # Add the user to his own group.
+    pwd_database = pwd.getpwnam(user)
+    subprocess.call(['addgroup', '--gid', str(pwd_database.pw_gid), user])
+
 
 def initialize(
     user, full_name, email, lpuser, private_key, public_key, valid_ssh_keys,
@@ -146,16 +153,20 @@
     # XXX benji 2012-03-19 bug=959352: this is so graphviz will work in an
     # ephemeral container
     mkdirs('/rootfs/usr/lib')
-    os.symlink('/usr/lib/graphviz', '/rootfs/usr/lib/graphviz')
+    dst = '/rootfs/usr/lib/graphviz'
+    if not os.path.exists(dst):
+        os.symlink('/usr/lib/graphviz', dst)
     # XXX gary 2012-06-26 bug=1014916: this fixes a bug in Lucid LXC
     # containers.
     if lxc_os == 'lucid':
         # Change /var/lib/lxc/lptests/rootfs/etc/init/networking.conf to not
         # wait for udev (that is, use start on (local-filesystems)).
         udevtrigger = '/etc/init/udevtrigger.conf'
-        shutil.move(udevtrigger, udevtrigger + '.orig')
+        if os.path.exists(udevtrigger):
+            shutil.move(udevtrigger, udevtrigger + '.orig')
         networking = '/etc/init/networking.conf'
-        shutil.move(networking, networking + '.orig')
+        if not os.path.exists(networking + '.orig'):
+            shutil.move(networking, networking + '.orig')
         render_to_file('networking.conf', {}, networking)
 
 
@@ -215,7 +226,7 @@
                  'The current user is used if this script is not run as '
                  'root and this argument is omitted.')
         parser.add_argument(
-            '-e', '--email',
+            '-E', '--email',
             help='The email of the user, used for bzr whoami. This argument '
                  'can be omitted if a bzr id exists for current user.')
         parser.add_argument(

=== modified file 'lpsetup/subcommands/initlxc.py'
--- lpsetup/subcommands/initlxc.py	2012-07-10 17:36:49 +0000
+++ lpsetup/subcommands/initlxc.py	2012-07-12 22:14:19 +0000
@@ -156,7 +156,7 @@
                     private_key, public_key, ssh_key_name, home_dir):
     """Prepare the Launchpad environment inside an LXC."""
     # Use ssh to call this script from inside the container.
-    args = ['init-host', '-u', user, '-e', email, '-f', full_name,
+    args = ['init-host', '-u', user, '-E', email, '-f', full_name,
             '-l', lpuser, '-S', ssh_key_name,
             ]
 
@@ -220,10 +220,15 @@
             help='The LXC container architecture. '
                  '[DEFAULT={0}]'.format(LXC_GUEST_ARCH))
         parser.add_argument(
-            '-r', '--lxc-os', default=LXC_GUEST_OS,
+            '-R', '--lxc-os', default=LXC_GUEST_OS,
             choices=LXC_GUEST_CHOICES,
             help='The LXC container distro codename. '
                  '[DEFAULT={0}]'.format(LXC_GUEST_OS))
         parser.add_argument(
             '--stop-lxc', action='store_true',
             help='Shut down the LXC container at the end of the process.')
+        parser.add_argument(
+            '--install-subunit', action='store_true',
+            help='Install subunit in the host machine. Activate this if you '
+                 'are using this command to create an automated parallel '
+                 'testing environment e.g. for buildbot.')

=== modified file 'lpsetup/subcommands/initrepo.py'
--- lpsetup/subcommands/initrepo.py	2012-07-10 18:11:30 +0000
+++ lpsetup/subcommands/initrepo.py	2012-07-12 22:14:19 +0000
@@ -2,7 +2,16 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""initrepo subcommand: prepare source code destinations and download it."""
+"""init-repo subcommand: prepare source code destinations and download them.
+
+Prepares the user's Launchpad directory structure and downloads the
+latest Launchpad source code.  Sets up ~/.bazaar/locations.conf
+appropriately.  The repository uses the sandbox development model as
+specified in `lxc-install`.
+
+Run as the user in the Launchpad target, either a host machine or LXC
+container.
+"""
 
 __metaclass__ = type
 __all__ = [
@@ -81,8 +90,8 @@
         handlers.handle_source,
         )
 
-    def add_arguments(self, parser):
-        super(SubCommand, self).add_arguments(parser)
+    @staticmethod
+    def add_common_arguments(parser):
         parser.add_argument(
             '--source', default=None,
             help='Location from which to retrieve Launchpad source.  Default '
@@ -106,3 +115,7 @@
                  'The directory must reside under the home directory of the '
                  'given user (see -u argument). '
                  '[DEFAULT={0}]'.format(CHECKOUT_DIR))
+
+    def add_arguments(self, parser):
+        super(SubCommand, self).add_arguments(parser)
+        self.add_common_arguments(parser)

=== modified file 'lpsetup/subcommands/install_lxc.py'
--- lpsetup/subcommands/install_lxc.py	2012-07-10 19:06:12 +0000
+++ lpsetup/subcommands/install_lxc.py	2012-07-12 22:14:19 +0000
@@ -8,38 +8,25 @@
 __all__ = [
     'create_scripts',
     'SubCommand',
-    'setup_lxc',
     ]
 
 import os
-import subprocess
 
-from shelltoolbox import (
-    get_su_command,
-    mkdirs,
-    run,
-    su,
-    )
 from lpsetup.handlers import (
     handle_directories,
-    handle_testing,
+    handle_source,
     )
 from lpsetup.settings import (
-    LP_BRANCH_NAME,
-    LP_HTTP_REPO,
-    LP_SOURCE_DEPS,
-    LP_SSH_REPO,
-    CHECKOUT_DIR,
-    DEPENDENCIES_DIR,
     LXC_IP_COMMAND,
     SCRIPTS,
     )
 from lpsetup.subcommands import (
-    inithost,
+    finish_inithost,
     initlxc,
+    initrepo,
+    update,
     )
 from lpsetup.utils import (
-    call,
     get_file_header,
     render_to_file,
     sshlxc as ssh,
@@ -81,67 +68,43 @@
         f.write('0\n')
 
 
-def setup_lxc(lxc_name, ssh_key_path, user, dependencies_dir, repository):
-    """Set up the Launchpad environment inside an LXC."""
-    # Use ssh to call this script from inside the container.
-    args = [
-        'install', '-u', user, '-s', 'setup_apt', 'setup_bzr_locatoins',
-        'setup_launchpad', '-d', dependencies_dir, '-r', repository,
-        ]
-    cmd = this_command(repository, args)
+def cmd_in_lxc(lxc_name, ssh_key_path, home_dir, args, as_user=None):
+    print "args = ", args
+    cmd = this_command(home_dir, args)
+    if as_user is not None:
+        cmd = "su {} -c '{}'".format(as_user, cmd)
+    print "CMD = ", cmd
     ssh(lxc_name, cmd, key=ssh_key_path)
 
 
-def setup_codebase(user, checkout_dir, dependencies_dir, valid_ssh_keys=True):
-    """Set up Launchpad repository and source dependencies.
-
-    Return True if new changes are pulled from bzr repository.
-    """
-    # TODO If doing no trees, use --lightweight.
-    # Using real su because bzr uses uid.
-    if os.path.exists(checkout_dir):
-        # Pull the repository.
-        revno_args = ('bzr', 'revno', checkout_dir)
-        revno = run(*revno_args)
-        call(*get_su_command(user, ['bzr', 'pull', '-d', checkout_dir]))
-        changed = revno != run(*revno_args)
-    else:
-        # Branch the repository.
-        # If we have valid SSH keys we should use the "lp:" style URL, "http"
-        # if not.
-        if valid_ssh_keys:
-            repo = LP_SSH_REPO
-        else:
-            repo = LP_HTTP_REPO
-        cmd = ('bzr', 'branch', repo, checkout_dir)
-        call(*get_su_command(user, cmd))
-        changed = True
-    # Check repository integrity.
-    if subprocess.call(['bzr', 'status', '-q', checkout_dir]):
-        raise subprocess.CalledProcessError(
-            'Repository {0} is corrupted.'.format(checkout_dir))
-    # Set up source dependencies.
-    with su(user):
-        for subdir in ('eggs', 'yui', 'sourcecode'):
-            mkdirs(os.path.join(dependencies_dir, subdir))
-        download_cache = os.path.join(dependencies_dir, 'download-cache')
-        if os.path.exists(download_cache):
-            call('bzr', 'up', download_cache)
-        else:
-            call('bzr', 'co', '--lightweight', LP_SOURCE_DEPS, download_cache)
-    return changed
-
-
-def fetch(user, repository, dependencies_dir, valid_ssh_keys):
-    """Create a repo for the Launchpad code and retrieve it."""
-    # TODO Add --no-trees handling.
-    with su(user):
-        # Set up the repository.
-        mkdirs(repository)
-        call('bzr', 'init-repo', repository)
-    # Set up the codebase.
-    checkout_dir = os.path.join(repository, LP_BRANCH_NAME)
-    setup_codebase(user, checkout_dir, dependencies_dir, valid_ssh_keys)
+def init_repo_in_lxc(lxc_name, ssh_key_path, home_dir, user, source,
+                     use_http, branch_name, checkout_name, repository):
+    args = [
+        'init-repo', '--source', source,
+        '--branch-name', branch_name, '--checkout-name', checkout_name,
+        '--repository', repository,
+        ]
+    if use_http:
+        args.append('--use-http')
+    cmd_in_lxc(lxc_name, ssh_key_path, home_dir, args, as_user=user)
+
+
+def update_in_lxc(lxc_name, ssh_key_path, home_dir, user, external_path,
+                  use_http, checkout_name, repository):
+    working_dir = os.path.join(repository, checkout_name)
+    args = [
+        'update', '--external-path', external_path, '-W', working_dir,
+        ]
+    if use_http:
+        args.append('--use-http')
+    cmd_in_lxc(lxc_name, ssh_key_path, home_dir, args, as_user=user)
+
+
+def finish_inithost_in_lxc(lxc_name, ssh_key_path, home_dir, user, code_dir):
+    args = [
+        'finish-init-host', '--user', user, '--code-dir', code_dir,
+        ]
+    cmd_in_lxc(lxc_name, ssh_key_path, home_dir, args)
 
 
 class SubCommand(initlxc.SubCommand):
@@ -149,29 +112,23 @@
     development model.
     """
 
-    fetch_step = (fetch,
-         'user', 'repository', 'dependencies_dir', 'valid_ssh_keys')
-
-    steps = (
-        inithost.SubCommand.initialize_step,
-        fetch_step,
-        (create_scripts,
-         'lxc_name', 'ssh_key_path', 'user'),
-        initlxc.SubCommand.create_lxc_step + ('install_subunit',),
-        initlxc.SubCommand.start_lxc_step,
-        initlxc.SubCommand.wait_for_lxc_step,
-        # XXX bac, the following step no longer exists.  The functionality for
-        # this step needs to be refactored or removed.
-        # initlxc.SubCommand.initialize_lxc_step,
-        (setup_lxc,
-         'lxc_name', 'ssh_key_path', 'user', 'dependencies_dir', 'repository'),
-        initlxc.SubCommand.stop_lxc_step,
+    steps = initlxc.SubCommand.steps + (
+        # Run on host:
+        (create_scripts, 'lxc_name', 'ssh_key_path', 'user'),
+        # Run inside the container:
+        (init_repo_in_lxc, 'lxc_name', 'ssh_key_path', 'home_dir', 'user',
+          'source', 'use_http', 'branch_name', 'checkout_name', 'repository'),
+        (update_in_lxc, 'lxc_name', 'ssh_key_path', 'home_dir', 'user',
+         'external_path', 'use_http', 'checkout_name', 'repository'),
+        (finish_inithost_in_lxc, 'lxc_name', 'ssh_key_path', 'home_dir',
+         'user', 'code_dir'),
         )
+
     help = __doc__
 
     def get_handlers(self, namespace):
         handlers = super(SubCommand, self).get_handlers(namespace)
-        return handlers + (handle_directories, handle_testing)
+        return handlers + (handle_directories, handle_source)
 
     def call_create_scripts(self, namespace, step, args):
         """Run the `create_scripts` step only if the related flag is set."""
@@ -180,30 +137,11 @@
 
     def add_arguments(self, parser):
         super(SubCommand, self).add_arguments(parser)
-        parser.add_argument(
-            '-d', '--dependencies-dir', default=DEPENDENCIES_DIR,
-            help='The directory of the Launchpad dependencies to be created. '
-                 'The directory must reside under the home directory of the '
-                 'given user (see -u argument). '
-                 '[DEFAULT={0}]'.format(DEPENDENCIES_DIR))
-        parser.add_argument(
-            '-c', '--repository', default=CHECKOUT_DIR,
-            help='The directory of the Launchpad repository to be created. '
-                 'The directory must reside under the home directory of the '
-                 'given user (see -u argument). '
-                 '[DEFAULT={0}]'.format(CHECKOUT_DIR))
+        # Inherit arguments from subcommands we depend upon.
+        initrepo.SubCommand.add_common_arguments(parser)
+        update.SubCommand.add_common_arguments(parser)
+        finish_inithost.SubCommand.add_common_arguments(parser)
         # Add parallel testing related arguments.
         parser.add_argument(
             '-C', '--create-scripts', action='store_true',
             help='Create the scripts used by buildbot for parallel testing.')
-        # The following flag is not present in the inithost sub command since
-        # subunit is always installed there as a dependency of
-        # launchpad-developer-dependencies.
-        parser.add_argument(
-            '--install-subunit', action='store_true',
-            help='Install subunit in the host machine. Activate this if you '
-                 'are using this command to create an automated parallel '
-                 'testing environment e.g. for buildbot.')
-        parser.add_argument(
-            '--testing', action='store_true',
-            help='Same as --feed-random --create-scripts --install-subunit.')

=== modified file 'lpsetup/subcommands/update.py'
--- lpsetup/subcommands/update.py	2012-07-10 17:25:09 +0000
+++ lpsetup/subcommands/update.py	2012-07-12 22:14:19 +0000
@@ -18,7 +18,10 @@
 
 from lpsetup import argparser
 from lpsetup import handlers
-from lpsetup.settings import LP_SOURCE_DEPS
+from lpsetup.settings import (
+    LP_CODE_DIR,
+    LP_SOURCE_DEPS,
+    )
 
 
 def initialize_directories(external_path):
@@ -38,7 +41,7 @@
     run(cmd, use_http_param, source_path)
 
     # Update the download cache.
-    download_cache = os.path.join(external_path, 'download-cache')
+    download_cache = os.path.join(working_dir, 'download-cache')
     if os.path.exists(download_cache):
         run('bzr', 'up', download_cache)
     else:
@@ -77,20 +80,21 @@
         handlers.handle_working_dir,
         )
 
+    @staticmethod
+    def add_common_arguments(parser):
+        parser.add_argument(
+            '-e', '--external-path', default='.',
+            help='Path to directory that contains sourcecode '
+                 'and download-cache directories.')
+
     def add_arguments(self, parser):
         super(SubCommand, self).add_arguments(parser)
-        parser.add_argument(
-            '-e', '--external-path', default='.',
-            help='Path to directory that contains sourcecode '
-                 'and download-cache directories.'
-            )
+        self.add_common_arguments(parser)
         parser.add_argument(
             '--use-http', default=False, action='store_true',
             help='Force bzr to use http to get the sourcecode '
-                 'branches rather than using bzr+ssh.'
-            )
+                 'branches rather than using bzr+ssh.')
         parser.add_argument(
-            'working_dir', default='.',
-            help='Path to branch to update.  Default is '
-                 'the current directory. '
-            )
+            '-W', '--working-dir', default=LP_CODE_DIR,
+            help='Path to branch to update.  '
+                 '[DEFAULT={0}]'.format(LP_CODE_DIR))

=== renamed file 'lpsetup/tests/subcommands/disabled_test_finish_inithost.py' => 'lpsetup/tests/subcommands/test_finish_inithost.py' (properties changed: +x to -x)
--- lpsetup/tests/subcommands/disabled_test_finish_inithost.py	2012-07-10 19:35:18 +0000
+++ lpsetup/tests/subcommands/test_finish_inithost.py	2012-07-12 22:14:19 +0000
@@ -2,54 +2,40 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Tests for the install sub command."""
+"""Tests for the finish-init-host sub command."""
 
 import unittest
 
 from lpsetup import handlers
 from lpsetup.subcommands import finish_inithost
-from lpsetup.tests.subcommands import test_inithost
 from lpsetup.tests.utils import (
     get_random_string,
     StepsBasedSubCommandTestMixin,
     )
 
 
-setup_bzr_locations_step = (
-    finish_inithost.setup_bzr_locations_as_root,
-    ['user', 'lpuser', 'repository'])
 setup_launchpad_step = (
-    finish_inithost.setup_launchpad, ['user', 'dependencies_dir', 'repository',
-    'valid_ssh_keys'])
+    finish_inithost.setup_launchpad, ['user', 'code_dir'])
 
 
 def get_arguments():
-    inithost_arguments = test_inithost.get_arguments()
-    dependencies_dir = '~/' + get_random_string()
-    repository = '~/' + get_random_string()
-    return inithost_arguments + ('-d', dependencies_dir, '-r', repository)
-
-
-class InstallTest(StepsBasedSubCommandTestMixin, unittest.TestCase):
+    code_dir = '~/' + get_random_string()
+    user = get_random_string()
+    return ('-c', code_dir, '-u', user)
+
+
+class FinishInitHostTest(StepsBasedSubCommandTestMixin, unittest.TestCase):
 
     sub_command_class = finish_inithost.SubCommand
     expected_arguments = get_arguments()
     expected_handlers = (
         handlers.handle_user,
-        handlers.handle_lpuser_as_username,
-        handlers.handle_userdata,
-        handlers.handle_ssh_keys,
         handlers.handle_directories,
         )
 
     @property
     def expected_steps(self):
-        from lpsetup.tests.subcommands import test_install_lxc
         return (
-            test_inithost.initialize_step,
-            test_install_lxc.fetch_step,
-            setup_bzr_locations_step,
-            test_inithost.setup_apt_step,
             setup_launchpad_step,
             )
     needs_root = True

=== modified file 'lpsetup/tests/subcommands/test_inithost.py'
--- lpsetup/tests/subcommands/test_inithost.py	2012-07-11 11:47:39 +0000
+++ lpsetup/tests/subcommands/test_inithost.py	2012-07-12 22:14:19 +0000
@@ -36,7 +36,7 @@
     public_key = get_random_string()
     ssh_key_name = get_random_string()
     return (
-        '-u', user, '-e', email, '-f', full_name, '-l', lpuser,
+        '-u', user, '-E', email, '-f', full_name, '-l', lpuser,
         '-v', private_key, '-b', public_key, '-S', ssh_key_name)
 
 

=== modified file 'lpsetup/tests/subcommands/test_initlxc.py'
--- lpsetup/tests/subcommands/test_initlxc.py	2012-07-10 17:36:49 +0000
+++ lpsetup/tests/subcommands/test_initlxc.py	2012-07-12 22:14:19 +0000
@@ -38,11 +38,11 @@
     lxc_arch = random.choice(['i386', 'amd64'])
     lxc_os = random.choice(settings.LXC_GUEST_CHOICES)
     return (
-        lxc_name, '-A', lxc_arch, '-r', lxc_os,
+        lxc_name, '-A', lxc_arch, '-R', lxc_os,
         '--stop-lxc') + inithost_arguments
 
 
-class InithostTest(StepsBasedSubCommandTestMixin, unittest.TestCase):
+class InitLxcTest(StepsBasedSubCommandTestMixin, unittest.TestCase):
 
     sub_command_class = initlxc.SubCommand
     expected_arguments = get_arguments()

=== renamed file 'lpsetup/tests/subcommands/disabled_test_install_lxc.py' => 'lpsetup/tests/subcommands/test_install_lxc.py' (properties changed: +x to -x)
--- lpsetup/tests/subcommands/disabled_test_install_lxc.py	2012-07-10 19:35:18 +0000
+++ lpsetup/tests/subcommands/test_install_lxc.py	2012-07-12 22:14:19 +0000
@@ -9,7 +9,6 @@
 from lpsetup import handlers
 from lpsetup.subcommands import install_lxc
 from lpsetup.tests.subcommands import (
-    test_inithost,
     test_initlxc,
     )
 from lpsetup.tests.utils import (
@@ -18,24 +17,32 @@
     )
 
 
-fetch_step = (
-    install_lxc.fetch, ['user', 'repository', 'dependencies_dir',
-        'valid_ssh_keys'])
 create_scripts_step = (
     install_lxc.create_scripts, ['lxc_name', 'ssh_key_path', 'user'])
-create_lxc_callable, create_lxc_args = test_initlxc.create_lxc_step
-create_lxc_step = (create_lxc_callable, create_lxc_args + ['install_subunit'])
-setup_lxc_step = (
-    install_lxc.setup_lxc, ['lxc_name', 'ssh_key_path', 'user',
-    'dependencies_dir', 'repository'])
+
+init_repo_in_lxc_step = (
+    install_lxc.init_repo_in_lxc, [
+        'lxc_name', 'ssh_key_path', 'home_dir', 'user', 'source', 'use_http',
+        'branch_name', 'checkout_name', 'repository',
+        ])
+
+update_in_lxc_step = (
+    install_lxc.update_in_lxc, [
+        'lxc_name', 'ssh_key_path', 'home_dir', 'user', 'external_path',
+        'use_http', 'checkout_name', 'repository',
+        ])
+
+finish_inithost_in_lxc_step = (
+    install_lxc.finish_inithost_in_lxc, [
+        'lxc_name', 'ssh_key_path', 'home_dir', 'user', 'code_dir',
+        ])
 
 
 def get_arguments():
-    dependencies_dir = '~/' + get_random_string()
     repository = '~/' + get_random_string()
     return test_initlxc.get_arguments() + (
-        '-d', dependencies_dir, '-c', repository,
-        '--create-scripts', '--install-subunit', '--testing',
+        '-r', repository,
+        '--create-scripts',
         )
 
 
@@ -43,23 +50,15 @@
 
     sub_command_class = install_lxc.SubCommand
     expected_arguments = get_arguments()
-    expected_handlers = (
-        handlers.handle_user,
-        handlers.handle_lpuser_as_username,
-        handlers.handle_userdata,
-        handlers.handle_ssh_keys,
+    expected_handlers = test_initlxc.InitLxcTest.expected_handlers + (
         handlers.handle_directories,
-        handlers.handle_testing,
+        handlers.handle_source,
         )
-    expected_steps = (
-        test_inithost.initialize_step,
-        fetch_step,
+    expected_steps = test_initlxc.InitLxcTest.expected_steps + (
         create_scripts_step,
-        create_lxc_step,
-        test_initlxc.start_lxc_step,
-        test_initlxc.wait_for_lxc_step,
-        test_initlxc.initialize_lxc_step,
-        setup_lxc_step,
-        test_initlxc.stop_lxc_step,
+        init_repo_in_lxc_step,
+        update_in_lxc_step,
+        finish_inithost_in_lxc_step,
         )
     needs_root = True
+    maxDiff = None

=== modified file 'lpsetup/tests/subcommands/test_update.py'
--- lpsetup/tests/subcommands/test_update.py	2012-07-07 12:58:12 +0000
+++ lpsetup/tests/subcommands/test_update.py	2012-07-12 22:14:19 +0000
@@ -18,7 +18,8 @@
     return (
         '--external-path', get_random_string(),
         '--use-http',
-        get_random_string(),
+        '-e', '../devel',
+        '-W', '~/' + get_random_string(),
         )
 
 init_dir_step = (update.initialize_directories, ['external_path'])

=== modified file 'pre-commit.sh'
--- pre-commit.sh	2012-07-10 17:58:00 +0000
+++ pre-commit.sh	2012-07-12 22:14:19 +0000
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-pyfiles=`find . -name "*.py" | grep -v distribute_setup.py `
+pyfiles=`find . -name "*.py" | grep -v distribute_setup.py`
 pocketlint $pyfiles && pep8 $pyfiles && nosetests

=== modified file 'setup.cfg'
--- setup.cfg	2012-07-10 19:35:18 +0000
+++ setup.cfg	2012-07-12 22:14:19 +0000
@@ -1,11 +1,10 @@
 [nosetests]
 detailed-errors=1
 exclude=handle_testing
-with-coverage=0
+with-coverage=1
 cover-package=lpsetup
 with-doctest=1
-# Including ignore-files here or on the command line causes the tests
-# to fail with a complaint about the version of distribute.  As a
-# work-around, rename disabled tests to 'disabled_'+test_name and set
-# the execute bit. 
-#ignore-files=disabled*
+# Specifying 'where' should not be required but it is a work-around
+# for a problem presented by having 'ignore-files'.
+where=lpsetup
+ignore-files=disabled*