summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/e2e/libpod_suite_test.go8
-rw-r--r--test/e2e/pod_infra_container_test.go (renamed from test/e2e/pod_pause_container_test.go)24
-rw-r--r--test/e2e/pod_stats_test.go32
3 files changed, 28 insertions, 36 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 019ba9377..8c9183450 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -32,7 +32,7 @@ var (
CGROUP_MANAGER = "systemd"
STORAGE_OPTIONS = "--storage-driver vfs"
ARTIFACT_DIR = "/tmp/.artifacts"
- CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, pause}
+ CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, nginx, redis, registry, infra}
RESTORE_IMAGES = []string{ALPINE, BB}
ALPINE = "docker.io/library/alpine:latest"
BB = "docker.io/library/busybox:latest"
@@ -41,7 +41,7 @@ var (
nginx = "quay.io/baude/alpine_nginx:latest"
redis = "docker.io/library/redis:alpine"
registry = "docker.io/library/registry:2"
- pause = "k8s.gcr.io/pause:3.1"
+ infra = "k8s.gcr.io/pause:3.1"
defaultWaitTimeout = 90
)
@@ -423,10 +423,10 @@ func (p *PodmanTest) RestoreAllArtifacts() error {
return nil
}
-// CreatePod creates a pod with no pause container
+// CreatePod creates a pod with no infra container
// it optionally takes a pod name
func (p *PodmanTest) CreatePod(name string) (*PodmanSession, int, string) {
- var podmanArgs = []string{"pod", "create", "--pause=false", "--share", ""}
+ var podmanArgs = []string{"pod", "create", "--infra=false", "--share", ""}
if name != "" {
podmanArgs = append(podmanArgs, "--name", name)
}
diff --git a/test/e2e/pod_pause_container_test.go b/test/e2e/pod_infra_container_test.go
index 09a1c18d0..2dcce6525 100644
--- a/test/e2e/pod_pause_container_test.go
+++ b/test/e2e/pod_infra_container_test.go
@@ -23,7 +23,7 @@ var _ = Describe("Podman pod create", func() {
}
podmanTest = PodmanCreate(tempdir)
podmanTest.RestoreAllArtifacts()
- podmanTest.RestoreArtifact(pause)
+ podmanTest.RestoreArtifact(infra)
})
AfterEach(func() {
@@ -33,7 +33,7 @@ var _ = Describe("Podman pod create", func() {
GinkgoWriter.Write([]byte(timedResult))
})
- It("podman create pause container", func() {
+ It("podman create infra container", func() {
session := podmanTest.Podman([]string{"pod", "create"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
@@ -50,7 +50,7 @@ var _ = Describe("Podman pod create", func() {
Expect(len(check.OutputToStringArray())).To(Equal(1))
})
- It("podman start pause container", func() {
+ It("podman start infra container", func() {
session := podmanTest.Podman([]string{"pod", "create"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
@@ -66,7 +66,7 @@ var _ = Describe("Podman pod create", func() {
Expect(len(check.OutputToStringArray())).To(Equal(1))
})
- It("podman pause container namespaces", func() {
+ It("podman infra container namespaces", func() {
session := podmanTest.Podman([]string{"pod", "create"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
@@ -134,8 +134,8 @@ var _ = Describe("Podman pod create", func() {
Expect(len(PIDs)).To(Equal(4))
ctrPID, _ := strconv.Atoi(PIDs[1])
- pausePID, _ := strconv.Atoi(PIDs[2])
- Expect(ctrPID).To(BeNumerically("<", pausePID))
+ infraPID, _ := strconv.Atoi(PIDs[2])
+ Expect(ctrPID).To(BeNumerically("<", infraPID))
})
It("podman pod doesn't share PIDNS if requested to not", func() {
@@ -160,11 +160,11 @@ var _ = Describe("Podman pod create", func() {
check = podmanTest.Podman([]string{"top", podID[:12] + "-infra", "pid"})
check.WaitWithDefaultTimeout()
Expect(check.ExitCode()).To(Equal(0))
- pauseTop := check.OutputToStringArray()
+ infraTop := check.OutputToStringArray()
ctrPID, _ := strconv.Atoi(ctrTop[1])
- pausePID, _ := strconv.Atoi(pauseTop[1])
- Expect(ctrPID).To(Equal(pausePID))
+ infraPID, _ := strconv.Atoi(infraTop[1])
+ Expect(ctrPID).To(Equal(infraPID))
})
It("podman pod container can override pod net NS", func() {
@@ -263,7 +263,7 @@ var _ = Describe("Podman pod create", func() {
Expect(PID1).To(Not(Equal(PID2)))
})
- It("podman pod pause container deletion", func() {
+ It("podman pod infra container deletion", func() {
session := podmanTest.Podman([]string{"pod", "create", "--share", "ipc"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
@@ -272,9 +272,9 @@ var _ = Describe("Podman pod create", func() {
session = podmanTest.Podman([]string{"ps", "-aq"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- pauseID := session.OutputToString()
+ infraID := session.OutputToString()
- session = podmanTest.Podman([]string{"rm", pauseID})
+ session = podmanTest.Podman([]string{"rm", infraID})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Not(Equal(0)))
diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go
index b7f939aa9..c230c8973 100644
--- a/test/e2e/pod_stats_test.go
+++ b/test/e2e/pod_stats_test.go
@@ -43,12 +43,10 @@ var _ = Describe("Podman pod stats", func() {
})
It("podman stats on a specific running pod", func() {
- session := podmanTest.Podman([]string{"pod", "create"})
- session.WaitWithDefaultTimeout()
- Expect(session.ExitCode()).To(Equal(0))
- podid := session.OutputToString()
+ _, ec, podid := podmanTest.CreatePod("")
+ Expect(ec).To(Equal(0))
- session = podmanTest.RunTopContainerInPod("", podid)
+ session := podmanTest.RunTopContainerInPod("", podid)
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
@@ -100,12 +98,10 @@ var _ = Describe("Podman pod stats", func() {
})
It("podman stats on running pods", func() {
- session := podmanTest.Podman([]string{"pod", "create"})
- session.WaitWithDefaultTimeout()
- Expect(session.ExitCode()).To(Equal(0))
- podid := session.OutputToString()
+ _, ec, podid := podmanTest.CreatePod("")
+ Expect(ec).To(Equal(0))
- session = podmanTest.RunTopContainerInPod("", podid)
+ session := podmanTest.RunTopContainerInPod("", podid)
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
@@ -119,12 +115,10 @@ var _ = Describe("Podman pod stats", func() {
})
It("podman stats on all pods", func() {
- session := podmanTest.Podman([]string{"pod", "create"})
- session.WaitWithDefaultTimeout()
- Expect(session.ExitCode()).To(Equal(0))
- podid := session.OutputToString()
+ _, ec, podid := podmanTest.CreatePod("")
+ Expect(ec).To(Equal(0))
- session = podmanTest.RunTopContainerInPod("", podid)
+ session := podmanTest.RunTopContainerInPod("", podid)
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
@@ -138,12 +132,10 @@ var _ = Describe("Podman pod stats", func() {
})
It("podman stats with json output", func() {
- session := podmanTest.Podman([]string{"pod", "create"})
- session.WaitWithDefaultTimeout()
- Expect(session.ExitCode()).To(Equal(0))
- podid := session.OutputToString()
+ _, ec, podid := podmanTest.CreatePod("")
+ Expect(ec).To(Equal(0))
- session = podmanTest.RunTopContainerInPod("", podid)
+ session := podmanTest.RunTopContainerInPod("", podid)
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 19:48:05 +0000