Merge lp:~frankban/lpsetup/install-lxc-stops-lxc into lp:lpsetup

[Francesco Banconi]

install-lxc can stop the container at the end of the process

== Changes ==

Moved the *stop_lxc* step so that it is the last step executed by install-lxc.

[Gary Poster (gary)]

Hi Francesco. This looks fine, and I'll approve it in order to move the card along in your absence. That said, I do wonder why you arranged the tuples the way you did. I'd be inclined to slightly simplify things as follows:

=== modified file 'lpsetup/subcommands/install_lxc.py'
--- lpsetup/subcommands/install_lxc.py 2012-07-20 16:18:59 +0000
+++ lpsetup/subcommands/install_lxc.py 2012-07-23 18:31:43 +0000
@@ -120,7 +120,8 @@
          'external_path', 'target_dir', 'use_http'),
         (finish_inithost_in_lxc, 'lxc_name', 'ssh_key_path', 'home_dir',
          'user', 'target_dir'),
- ) + (initlxc.SubCommand.stop_lxc_step,)
+ # Run on host:
+ initlxc.SubCommand.stop_lxc_step,)

     help = __doc__

=== modified file 'lpsetup/tests/subcommands/test_install_lxc.py'
--- lpsetup/tests/subcommands/test_install_lxc.py 2012-07-20 16:18:59 +0000
+++ lpsetup/tests/subcommands/test_install_lxc.py 2012-07-23 18:31:17 +0000
@@ -61,6 +61,6 @@
         init_repo_in_lxc_step,
         update_in_lxc_step,
         finish_inithost_in_lxc_step,
- ) + (test_initlxc.stop_lxc_step,)
+ test_initlxc.stop_lxc_step,)
     needs_root = True
     maxDiff = None

review: Approve

=== modified file 'lpsetup/subcommands/initlxc.py'
--- lpsetup/subcommands/initlxc.py	2012-07-18 10:53:15 +0000
+++ lpsetup/subcommands/initlxc.py	2012-07-23 11:30:30 +0000
@@ -226,7 +226,7 @@
     stop_lxc_step = (stop_lxc,
         'lxc_name', 'ssh_key_path')
 
-    steps = (
+    base_steps = (
         (initialize, 'user'),
         inithost.SubCommand.setup_home_step,
         create_lxc_step,
@@ -234,8 +234,8 @@
         wait_for_lxc_step,
         install_lpsetup_in_lxc_step,
         inithost_in_lxc_step,
-        stop_lxc_step,
         )
+    steps = base_steps + (stop_lxc_step,)
 
     help = __doc__
     needs_root = True

=== modified file 'lpsetup/subcommands/install_lxc.py'
--- lpsetup/subcommands/install_lxc.py	2012-07-20 14:51:13 +0000
+++ lpsetup/subcommands/install_lxc.py	2012-07-23 11:30:30 +0000
@@ -109,7 +109,7 @@
     development model.
     """
 
-    steps = initlxc.SubCommand.steps + (
+    steps = initlxc.SubCommand.base_steps + (
         # Run on host:
         (create_scripts, 'lxc_name', 'ssh_key_path', 'user'),
         # Run inside the container:
@@ -120,7 +120,7 @@
          'external_path', 'target_dir', 'use_http'),
         (finish_inithost_in_lxc, 'lxc_name', 'ssh_key_path', 'home_dir',
          'user', 'target_dir'),
-        )
+        ) + (initlxc.SubCommand.stop_lxc_step,)
 
     help = __doc__
 

=== modified file 'lpsetup/tests/subcommands/test_install_lxc.py'
--- lpsetup/tests/subcommands/test_install_lxc.py	2012-07-20 10:40:43 +0000
+++ lpsetup/tests/subcommands/test_install_lxc.py	2012-07-23 11:30:30 +0000
@@ -56,11 +56,11 @@
         handlers.handle_source,
         handlers.handle_target_from_repository,
         )
-    expected_steps = test_initlxc.InitLxcTest.expected_steps + (
+    expected_steps = test_initlxc.InitLxcTest.expected_steps[:-1] + (
         create_scripts_step,
         init_repo_in_lxc_step,
         update_in_lxc_step,
         finish_inithost_in_lxc_step,
-        )
+        ) + (test_initlxc.stop_lxc_step,)
     needs_root = True
     maxDiff = None