Merge pull request #6305 from baude/v2podcreatetest

enable pod_create remote integration tests
containers · May 20, 2020 · e8e5a5f · e8e5a5f
2 parents 46ca450 + fed4ef0
commit e8e5a5f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/pkg/api/handlers/compat/containers_start.go b/pkg/api/handlers/compat/containers_start.go
@@ -33,7 +33,6 @@ func StartContainer(w http.ResponseWriter, r *http.Request) {
 		utils.ContainerNotFound(w, name, err)
 		return
 	}
-
 	state, err := con.State()
 	if err != nil {
 		utils.InternalServerError(w, err)
@@ -43,7 +42,7 @@ func StartContainer(w http.ResponseWriter, r *http.Request) {
 		utils.WriteResponse(w, http.StatusNotModified, "")
 		return
 	}
-	if err := con.Start(r.Context(), false); err != nil {
+	if err := con.Start(r.Context(), len(con.PodID()) > 0); err != nil {
 		utils.InternalServerError(w, err)
 		return
 	}

diff --git a/pkg/api/handlers/compat/container_start.go → pkg/api/handlers/compat/containers_stop.go b/pkg/api/handlers/compat/container_start.go → pkg/api/handlers/compat/containers_stop.go
diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go
@@ -84,7 +84,6 @@ var _ = Describe("Podman pod create", func() {
 	})
 
 	It("podman create pod without network portbindings", func() {
-		Skip(v2remotefail)
 		name := "test"
 		session := podmanTest.Podman([]string{"pod", "create", "--name", name})
 		session.WaitWithDefaultTimeout()
@@ -100,7 +99,6 @@ var _ = Describe("Podman pod create", func() {
 	})
 
 	It("podman create pod with network portbindings", func() {
-		Skip(v2remotefail)
 		name := "test"
 		session := podmanTest.Podman([]string{"pod", "create", "--name", name, "-p", "8080:80"})
 		session.WaitWithDefaultTimeout()