← Back to branch summary

~frankban/golxc/fix-logging-suite

« back to all changes in this revision

Viewing changes to golxc.go

  • Committer: Tim Penhey
  • Date: 2014-03-05 03:36:19 UTC
  • mfrom: (5.2.1 nicer-destroy)
  • Revision ID: tim.penhey@canonical.com-20140305033619-2j5t8cvd52526aje
Make sure the tests pass

Show diffs side-by-side

added added

removed removed

Lines of Context:
golxc.go
223
223
        if err != nil {
224
224
                return err
225
225
        }
226
 
        return c.Wait(StateRunning)
 
226
        return c.Wait(StateRunning, StateStopped)
227
227
}
228
228
 
229
229
// Stop terminates the running container.
231
231
        if !c.IsConstructed() {
232
232
                return fmt.Errorf("container %q is not yet created", c.name)
233
233
        }
 
234
        // If the container is not running, we are done.
 
235
        if !c.IsRunning() {
 
236
                return nil
 
237
        }
234
238
        args := []string{
235
239
                "-n", c.name,
236
240
        }