diff options
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/images_test.go | 32 | ||||
| -rw-r--r-- | test/e2e/login_logout_test.go | 5 |
2 files changed, 26 insertions, 11 deletions
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 80e6d4444..9a67cc83a 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -270,26 +270,36 @@ RUN apk update && apk add man Expect(result.ExitCode()).To(Equal(0)) }) - It("podman images sort by tag", func() { - session := podmanTest.Podman([]string{"images", "--sort", "tag", "--format={{.Tag}}"}) - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + It("podman images sort by values", func() { + sortValueTest := func(value string, result int, format string) []string { + f := fmt.Sprintf("{{.%s}}", format) + session := podmanTest.Podman([]string{"images", "--sort", value, "--format", f}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(result)) + + return session.OutputToStringArray() + } - sortedArr := session.OutputToStringArray() + sortedArr := sortValueTest("created", 0, "CreatedTime") + Expect(sort.SliceIsSorted(sortedArr, func(i, j int) bool { return sortedArr[i] > sortedArr[j] })).To(BeTrue()) + + sortedArr = sortValueTest("id", 0, "ID") Expect(sort.SliceIsSorted(sortedArr, func(i, j int) bool { return sortedArr[i] < sortedArr[j] })).To(BeTrue()) - }) - It("podman images sort by size", func() { - session := podmanTest.Podman([]string{"images", "--sort", "size", "--format={{.Size}}"}) - session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Equal(0)) + sortedArr = sortValueTest("repository", 0, "Repository") + Expect(sort.SliceIsSorted(sortedArr, func(i, j int) bool { return sortedArr[i] < sortedArr[j] })).To(BeTrue()) - sortedArr := session.OutputToStringArray() + sortedArr = sortValueTest("size", 0, "Size") Expect(sort.SliceIsSorted(sortedArr, func(i, j int) bool { size1, _ := units.FromHumanSize(sortedArr[i]) size2, _ := units.FromHumanSize(sortedArr[j]) return size1 < size2 })).To(BeTrue()) + sortedArr = sortValueTest("tag", 0, "Tag") + Expect(sort.SliceIsSorted(sortedArr, func(i, j int) bool { return sortedArr[i] < sortedArr[j] })).To(BeTrue()) + + sortValueTest("badvalue", 125, "Tag") + sortValueTest("id", 125, "badvalue") }) It("podman images --all flag", func() { diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go index c3df10f5e..78c9b52d9 100644 --- a/test/e2e/login_logout_test.go +++ b/test/e2e/login_logout_test.go @@ -95,6 +95,7 @@ var _ = Describe("Podman login and logout", func() { }) It("podman login and logout", func() { + SkipIfRootless() session := podmanTest.Podman([]string{"login", "-u", "podmantest", "-p", "test", server}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -113,6 +114,7 @@ var _ = Describe("Podman login and logout", func() { }) It("podman login and logout with flag --authfile", func() { + SkipIfRootless() authFile := filepath.Join(podmanTest.TempDir, "auth.json") session := podmanTest.Podman([]string{"login", "--username", "podmantest", "--password", "test", "--authfile", authFile, server}) session.WaitWithDefaultTimeout() @@ -145,6 +147,7 @@ var _ = Describe("Podman login and logout", func() { }) It("podman login and logout with --tls-verify", func() { + SkipIfRootless() session := podmanTest.Podman([]string{"login", "--username", "podmantest", "--password", "test", "--tls-verify=false", server}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -158,6 +161,7 @@ var _ = Describe("Podman login and logout", func() { Expect(session.ExitCode()).To(Equal(0)) }) It("podman login and logout with --cert-dir", func() { + SkipIfRootless() certDir := filepath.Join(podmanTest.TempDir, "certs") os.MkdirAll(certDir, os.ModePerm) @@ -177,6 +181,7 @@ var _ = Describe("Podman login and logout", func() { Expect(session.ExitCode()).To(Equal(0)) }) It("podman login and logout with multi registry", func() { + SkipIfRootless() os.MkdirAll("/etc/containers/certs.d/localhost:9001", os.ModePerm) cwd, _ := os.Getwd() |