summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-05-20 14:57:30 -0500
committerBrent Baude <bbaude@redhat.com>2020-05-20 14:57:30 -0500
commitfed4ef09ce606194dab4052c47b85476654e91e3 (patch)
tree2fa415c20622f24b80f65ba0763d9ba781d8746c
parent09f8f14b4f7d09946d3d5cfc5460ec9923f7da59 (diff)
downloadpodman-fed4ef09ce606194dab4052c47b85476654e91e3.tar.gz
podman-fed4ef09ce606194dab4052c47b85476654e91e3.tar.bz2
podman-fed4ef09ce606194dab4052c47b85476654e91e3.zip
enable pod_create remote integration tests
Signed-off-by: Brent Baude <bbaude@redhat.com>
-rw-r--r--pkg/api/handlers/compat/containers_start.go3
-rw-r--r--pkg/api/handlers/compat/containers_stop.go (renamed from pkg/api/handlers/compat/container_start.go)0
-rw-r--r--test/e2e/pod_create_test.go2
3 files changed, 1 insertions, 4 deletions
diff --git a/pkg/api/handlers/compat/containers_start.go b/pkg/api/handlers/compat/containers_start.go
index 9cb1492fb..cdbc8ff76 100644
--- 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 b/pkg/api/handlers/compat/containers_stop.go
index d26ef2c82..d26ef2c82 100644
--- a/pkg/api/handlers/compat/container_start.go
+++ b/pkg/api/handlers/compat/containers_stop.go
diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go
index 2f86776cc..24bfa69ce 100644
--- 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()