address review comments before merge

Signed-off-by: baude <bbaude@redhat.com>

libpod/container_internal.go

@@ -1195,10 +1195,8 @@ func (c *Container) pause() error {
 	}
 
 	if err := c.ociRuntime.PauseContainer(c); err != nil {
-		// TODO disabling to pass dockerpy tests.  there is some sort of problem and perhaps
-		//a race going on here.
-		logrus.Error(err)
-		//return err
+		// TODO when using docker-py there is some sort of race/incompatibility here
+		return err
 	}
 
 	logrus.Debugf("Paused container %s", c.ID())
@@ -1215,10 +1213,8 @@ func (c *Container) unpause() error {
 	}
 
 	if err := c.ociRuntime.UnpauseContainer(c); err != nil {
-		// TODO disabling to pass dockerpy tests.  there is some sort of problem and perhaps
-		//a race going on here.
-		logrus.Error(err)
-		//return err
+		// TODO when using docker-py there is some sort of race/incompatibility here
+		return err
 	}
 
 	logrus.Debugf("Unpaused container %s", c.ID())

pkg/api/handlers/containers_top.go

@@ -1,12 +1,12 @@
 package handlers
 
 import (
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 	"strings"
 
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"

pkg/api/handlers/events.go

@@ -3,9 +3,9 @@ package handlers
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/pkg/errors"
 )
 

pkg/api/handlers/generic/containers_create.go

@@ -3,7 +3,6 @@ package generic
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 	"strings"
 
@@ -12,6 +11,7 @@ import (
 	"github.com/containers/libpod/libpod/define"
 	image2 "github.com/containers/libpod/libpod/image"
 	"github.com/containers/libpod/pkg/api/handlers"
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/containers/libpod/pkg/namespaces"
 	createconfig "github.com/containers/libpod/pkg/spec"
 	"github.com/containers/storage"

pkg/api/handlers/generic/info.go

@@ -2,8 +2,6 @@ package generic
 
 import (
 	"fmt"
-	"github.com/containers/libpod/pkg/api/handlers"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -14,6 +12,8 @@ import (
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/config"
 	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/api/handlers"
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/containers/libpod/pkg/rootless"
 	"github.com/containers/libpod/pkg/sysinfo"
 	docker "github.com/docker/docker/api/types"

pkg/api/handlers/generic/system.go

@@ -1,10 +1,10 @@
 package generic
 
 import (
-	"github.com/containers/libpod/pkg/api/handlers"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 
+	"github.com/containers/libpod/pkg/api/handlers"
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	docker "github.com/docker/docker/api/types"
 )
 

pkg/api/handlers/generic/version.go

@@ -2,14 +2,14 @@ package generic
 
 import (
 	"fmt"
-	"github.com/containers/libpod/pkg/api/handlers"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 	goRuntime "runtime"
 	"time"
 
 	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/api/handlers"
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	docker "github.com/docker/docker/api/types"
 	"github.com/pkg/errors"
 )

pkg/api/handlers/handler.go

@@ -1,11 +1,12 @@
 package handlers
 
 import (
+	"net/http"
+
 	"github.com/containers/libpod/libpod"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
 	"github.com/pkg/errors"
-	"net/http"
 )
 
 // Convenience routines to reduce boiler plate in handlers

pkg/api/server/register_swarm.go

@@ -2,9 +2,9 @@ package server
 
 import (
 	"errors"
-	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"net/http"
 
+	"github.com/containers/libpod/pkg/api/handlers/utils"
 	"github.com/gorilla/mux"
 	"github.com/sirupsen/logrus"
 )