Merge lp:~frankban/lpsetup/juju-fixes into lp:lpsetup

[Francesco Banconi]

Fixed --install-subunit.

== Changes ==

Fixed initlxc command to actually pass `install_subunit` to the *create_lxc* step.
This way --install-subunit is honored when executing the command.

[Brad Crittenden (bac)]

Thanks Francesco

review: Approve (code)

=== modified file 'lpsetup/subcommands/initlxc.py'
--- lpsetup/subcommands/initlxc.py	2012-07-20 16:18:59 +0000
+++ lpsetup/subcommands/initlxc.py	2012-07-25 08:30:30 +0000
@@ -65,7 +65,7 @@
     apt_get_install('haveged', caller=call)
 
 
-def create_lxc(lxc_name, lxc_arch, lxc_os, user, install_subunit=False):
+def create_lxc(lxc_name, lxc_arch, lxc_os, user, install_subunit):
     """Create the LXC named `lxc_name` sharing `user` home directory.
 
     The container will be used as development environment or as base template
@@ -212,7 +212,7 @@
     """
 
     create_lxc_step = (create_lxc,
-        'lxc_name', 'lxc_arch', 'lxc_os', 'user')
+        'lxc_name', 'lxc_arch', 'lxc_os', 'user', 'install_subunit')
     start_lxc_step = (start_lxc,
         'lxc_name')
     wait_for_lxc_step = (wait_for_lxc,
 
=== modified file 'lpsetup/tests/subcommands/test_initlxc.py'
--- lpsetup/tests/subcommands/test_initlxc.py	2012-07-18 10:53:15 +0000
+++ lpsetup/tests/subcommands/test_initlxc.py	2012-07-25 08:30:30 +0000
@@ -20,7 +20,8 @@
 
 initialize_step = (initlxc.initialize, ['user'])
 create_lxc_step = (
-    initlxc.create_lxc, ['lxc_name', 'lxc_arch', 'lxc_os', 'user'])
+    initlxc.create_lxc,
+    ['lxc_name', 'lxc_arch', 'lxc_os', 'user', 'install_subunit'])
 start_lxc_step = (initlxc.start_lxc, ['lxc_name'])
 wait_for_lxc_step = (initlxc.wait_for_lxc, ['lxc_name', 'ssh_key_path'])
 install_lpsetup_in_lxc_step = (
@@ -40,7 +41,7 @@
     lxc_os = random.choice(settings.LXC_GUEST_CHOICES)
     return (
         lxc_name, '-A', lxc_arch, '-R', lxc_os,
-        '--stop-lxc') + inithost_arguments
+        '--stop-lxc', '--install-subunit') + inithost_arguments
 
 
 class InitLxcTest(StepsBasedSubCommandTestMixin, unittest.TestCase):