Merge lp://staging/~thumper/golxc/nicer-destroy into lp://staging/golxc
| Status: | Merged |
|---|---|
| Merged at revision: | 7 |
| Proposed branch: | lp://staging/~thumper/golxc/nicer-destroy |
| Merge into: | lp://staging/golxc |
| Diff against target: |
34 lines (+8/-1) 2 files modified
golxc.go (+5/-1) golxc_test.go (+3/-0) |
| To merge this branch: | bzr merge lp://staging/~thumper/golxc/nicer-destroy |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| John A Meinel | Approve | ||
|
Review via email:
|
|||
Commit message
Don't stop a stopped container.
Newer versions of lxc > 0.9 error on lxc-stop if the
container is stopped.
The LXCSuite.
to be run as root, so awkward to test).
Description of the change
Don't stop a stopped container.
Newer versions of lxc > 0.9 error on lxc-stop if the
container is stopped.
The LXCSuite.
to be run as root, so awkward to test).
This change fixes it, with a small drive by. The start
command now waits for Started or Stopped. When the
lxc-start command is executed, the container goes into
the starting state, and from there it moves to running if
all is good, or stopped if there was an error starting it.
If we don't wait for stopped as well, golxc waits forever.
We do need a better solution here for tests. The output
and behaviour of lxc has changed over the versions, so we
should have a version check for the tests. I'll file a
tech-debt bug around this.
| Tim Penhey (thumper) wrote | # |
Please take a look.