summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/e2e/generate_systemd_test.go28
-rw-r--r--test/e2e/healthcheck_run_test.go2
-rw-r--r--test/e2e/libpod_suite_remoteclient_test.go2
-rw-r--r--test/e2e/logs_test.go19
-rw-r--r--test/e2e/mount_test.go2
-rw-r--r--test/e2e/run_signal_test.go2
-rw-r--r--test/e2e/save_test.go2
-rw-r--r--test/endpoint/commit.go2
-rw-r--r--test/system/TODO.md2
-rwxr-xr-xtest/test_podman_pods.sh4
-rw-r--r--test/utils/common_function_test.go2
11 files changed, 57 insertions, 10 deletions
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go
index 91072b023..f0fef41a4 100644
--- a/test/e2e/generate_systemd_test.go
+++ b/test/e2e/generate_systemd_test.go
@@ -177,4 +177,32 @@ var _ = Describe("Podman generate systemd", func() {
found, _ = session.GrepString("/container-foo-1.service")
Expect(found).To(BeTrue())
})
+
+ It("podman generate systemd --new", func() {
+ n := podmanTest.Podman([]string{"create", "--name", "foo", "alpine", "top"})
+ n.WaitWithDefaultTimeout()
+ Expect(n.ExitCode()).To(Equal(0))
+
+ session := podmanTest.Podman([]string{"generate", "systemd", "--timeout", "42", "--name", "--new", "foo"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+
+ // Grepping the output (in addition to unit tests)
+ found, _ := session.GrepString("# container-foo.service")
+ Expect(found).To(BeTrue())
+
+ found, _ = session.GrepString("stop --cidfile /%t/%n-cid -t 42")
+ Expect(found).To(BeTrue())
+ })
+
+ It("podman generate systemd --new pod", func() {
+ n := podmanTest.Podman([]string{"pod", "create", "--name", "foo"})
+ n.WaitWithDefaultTimeout()
+ Expect(n.ExitCode()).To(Equal(0))
+
+ session := podmanTest.Podman([]string{"generate", "systemd", "--timeout", "42", "--name", "--new", "foo"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(125))
+ })
+
})
diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go
index 4acea06eb..7633261e3 100644
--- a/test/e2e/healthcheck_run_test.go
+++ b/test/e2e/healthcheck_run_test.go
@@ -42,7 +42,7 @@ var _ = Describe("Podman healthcheck run", func() {
})
It("podman healthcheck on valid container", func() {
- Skip("Extremely consistent flake - reenable on debugging")
+ Skip("Extremely consistent flake - re-enable on debugging")
session := podmanTest.Podman([]string{"run", "-dt", "--name", "hc", healthcheck})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
diff --git a/test/e2e/libpod_suite_remoteclient_test.go b/test/e2e/libpod_suite_remoteclient_test.go
index 2cd485114..c87ff016a 100644
--- a/test/e2e/libpod_suite_remoteclient_test.go
+++ b/test/e2e/libpod_suite_remoteclient_test.go
@@ -24,7 +24,7 @@ func SkipIfRemote() {
func SkipIfRootless() {
if os.Geteuid() != 0 {
- ginkgo.Skip("This function is not enabled for remote podman")
+ ginkgo.Skip("This function is not enabled for rootless podman")
}
}
diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index e25364695..0438a31cb 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -1,7 +1,9 @@
package integration
import (
+ "fmt"
"os"
+ "os/exec"
"strings"
. "github.com/containers/libpod/test/utils"
@@ -153,6 +155,23 @@ var _ = Describe("Podman logs", func() {
Expect(results.ExitCode()).To(BeZero())
})
+ It("podman journald logs for container with container tag", func() {
+ Skip("need to verify images have correct packages for journald")
+ logc := podmanTest.Podman([]string{"run", "--log-driver", "journald", "--log-opt=tag={{.ImageName}}", "-d", ALPINE, "sh", "-c", "echo podman; sleep 0.1; echo podman; sleep 0.1; echo podman"})
+ logc.WaitWithDefaultTimeout()
+ Expect(logc.ExitCode()).To(Equal(0))
+ cid := logc.OutputToString()
+
+ wait := podmanTest.Podman([]string{"wait", "-l"})
+ wait.WaitWithDefaultTimeout()
+ Expect(wait.ExitCode()).To(BeZero())
+
+ cmd := exec.Command("journalctl", "--no-pager", "-o", "json", "--output-fields=CONTAINER_TAG", "-u", fmt.Sprintf("libpod-conmon-%s.scope", cid))
+ out, err := cmd.CombinedOutput()
+ Expect(err).To(BeNil())
+ Expect(string(out)).To(ContainSubstring("alpine"))
+ })
+
It("podman journald logs for container", func() {
Skip("need to verify images have correct packages for journald")
logc := podmanTest.Podman([]string{"run", "--log-driver", "journald", "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"})
diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go
index dda83ba31..ac52d8c7e 100644
--- a/test/e2e/mount_test.go
+++ b/test/e2e/mount_test.go
@@ -205,7 +205,7 @@ var _ = Describe("Podman mount", func() {
Expect(lmount.OutputToString()).To(Equal(""))
})
- It("podman list mulitple mounted containers", func() {
+ It("podman list multiple mounted containers", func() {
SkipIfRootless()
setup := podmanTest.Podman([]string{"create", ALPINE, "ls"})
diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go
index 1d57e6211..eee7c14fb 100644
--- a/test/e2e/run_signal_test.go
+++ b/test/e2e/run_signal_test.go
@@ -47,7 +47,7 @@ var _ = Describe("Podman run with --sig-proxy", func() {
Specify("signals are forwarded to container using sig-proxy", func() {
if podmanTest.Host.Arch == "ppc64le" {
- Skip("Doesnt work on ppc64le")
+ Skip("Doesn't work on ppc64le")
}
signal := syscall.SIGFPE
// Set up a socket for communication
diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go
index 52dab923b..60825f975 100644
--- a/test/e2e/save_test.go
+++ b/test/e2e/save_test.go
@@ -51,7 +51,7 @@ var _ = Describe("Podman save", func() {
})
It("podman save with stdout", func() {
- Skip("Pipe redirection in ginkgo probably wont work")
+ Skip("Pipe redirection in ginkgo probably won't work")
outfile := filepath.Join(podmanTest.TempDir, "alpine.tar")
save := podmanTest.PodmanNoCache([]string{"save", ALPINE, ">", outfile})
diff --git a/test/endpoint/commit.go b/test/endpoint/commit.go
index 476ac6ca3..ab9af819f 100644
--- a/test/endpoint/commit.go
+++ b/test/endpoint/commit.go
@@ -40,7 +40,7 @@ var _ = Describe("Podman commit", func() {
// run the container to be committed
_ = endpointTest.startTopContainer("top")
result := endpointTest.Varlink("Commit", string(b), false)
- // This indicates an error occured
+ // This indicates an error occurred
Expect(len(result.StdErrToString())).To(BeNumerically(">", 0))
})
diff --git a/test/system/TODO.md b/test/system/TODO.md
index f6110d2e9..f0d311626 100644
--- a/test/system/TODO.md
+++ b/test/system/TODO.md
@@ -70,7 +70,7 @@ have been omitted as they are verified by repeated implied use.
- [ ] Container runlabel, exists, checkpoint, exists, restore, stop, prune
- Using pre-existing remote image, start it with 'podman container runlabel --pull'
- - Run a named container that exits immediatly
+ - Run a named container that exits immediately
- Confirm 'container exists' zero exit (both containers)
- Checkpoint the running container
- Confirm 'container exists' non-zero exit (runlabel container)
diff --git a/test/test_podman_pods.sh b/test/test_podman_pods.sh
index daa8acaee..f2f47f510 100755
--- a/test/test_podman_pods.sh
+++ b/test/test_podman_pods.sh
@@ -39,13 +39,13 @@ fi
########
-# Create a named and unamed pod
+# Create a named and unnamed pod
########
podman pod create --name foobar
podid=$(podman pod create)
########
-# Delete a named and unamed pod
+# Delete a named and unnamed pod
########
podman pod rm foobar
podman pod rm $podid
diff --git a/test/utils/common_function_test.go b/test/utils/common_function_test.go
index 98cb43188..46cce1076 100644
--- a/test/utils/common_function_test.go
+++ b/test/utils/common_function_test.go
@@ -115,7 +115,7 @@ var _ = Describe("Common functions test", func() {
bytes, _ := ioutil.ReadAll(read)
json.Unmarshal(bytes, compareData)
- Expect(reflect.DeepEqual(testData, compareData)).To(BeTrue(), "Data chaned after we store it to file.")
+ Expect(reflect.DeepEqual(testData, compareData)).To(BeTrue(), "Data changed after we store it to file.")
})
DescribeTable("Test Containerized",
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 12:46:31 +0000