Refactor Wait() to not require a timeout

We added a timeout for convenience, but most invocations don't
care about it. Refactor it into WaitWithTimeout() and add a
Wait() that doesn't require a timeout and uses the default.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #1527
Approved by: mheon

3 files changed, 4 insertions, 5 deletions

diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index ce7d0c40f..f9a96e4a6 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -121,7 +121,7 @@ func runCmd(c *cli.Context) error {
 		return err
 	}
 
-	if ecode, err := ctr.Wait(libpod.WaitTimeout); err != nil {
+	if ecode, err := ctr.Wait(); err != nil {
 		if errors.Cause(err) == libpod.ErrNoSuchCtr {
 			// The container may have been removed
 			// Go looking for an exit file
diff --git a/cmd/podman/start.go b/cmd/podman/start.go
index a80d0e1e8..cb65ec6d4 100644
--- a/cmd/podman/start.go
+++ b/cmd/podman/start.go
@@ -115,7 +115,7 @@ func startCmd(c *cli.Context) error {
 				return errors.Wrapf(err, "unable to start container %s", ctr.ID())
 			}
 
-			if ecode, err := ctr.Wait(libpod.WaitTimeout); err != nil {
+			if ecode, err := ctr.Wait(); err != nil {
 				logrus.Errorf("unable to get exit code of container %s: %q", ctr.ID(), err)
 			} else {
 				exitCode = int(ecode)
diff --git a/cmd/podman/wait.go b/cmd/podman/wait.go
index 48d3885e7..07db20eee 100644
--- a/cmd/podman/wait.go
+++ b/cmd/podman/wait.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/containers/libpod/cmd/podman/libpodruntime"
-	"github.com/containers/libpod/libpod"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )
@@ -21,7 +20,7 @@ var (
 		cli.UintFlag{
 			Name:  "interval, i",
 			Usage: "Milliseconds to wait before polling for completion",
-			Value: uint(libpod.WaitTimeout),
+			Value: 250,
 		},
 		LatestFlag,
 	}
@@ -69,7 +68,7 @@ func waitCmd(c *cli.Context) error {
 		if c.Uint("interval") == 0 {
 			return errors.Errorf("interval must be greater then 0")
 		}
-		returnCode, err := ctr.Wait(time.Duration(c.Uint("interval")))
+		returnCode, err := ctr.WaitWithInterval(time.Duration(c.Uint("interval")) * time.Millisecond)
 		if err != nil {
 			if lastError != nil {
 				fmt.Fprintln(os.Stderr, lastError)