summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <vrothberg@redhat.com>2022-05-05 10:38:42 +0200
committerValentin Rothberg <vrothberg@redhat.com>2022-05-05 11:03:14 +0200
commit669401c31468bf61e13a909655036d5acddbcb31 (patch)
tree0e66a3e1a9afc642e784c5e9d15738ada31a1bbf
parent2fa906ccae477decfd0f124cdc10c0367d3856d6 (diff)
downloadpodman-669401c31468bf61e13a909655036d5acddbcb31.tar.gz
podman-669401c31468bf61e13a909655036d5acddbcb31.tar.bz2
podman-669401c31468bf61e13a909655036d5acddbcb31.zip
e2e: pull_test: move tests around
Let's keep simple tests at the top and complex ones at the bottom. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
-rw-r--r--test/e2e/pull_test.go72
1 files changed, 36 insertions, 36 deletions
diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go
index 80fb5c2ba..0eff9a550 100644
--- a/test/e2e/pull_test.go
+++ b/test/e2e/pull_test.go
@@ -94,6 +94,42 @@ var _ = Describe("Podman pull", func() {
Expect(session).Should(Exit(0))
})
+ It("podman pull check quiet", func() {
+ err := podmanTest.RestoreArtifact(ALPINE)
+ Expect(err).ToNot(HaveOccurred())
+ setup := podmanTest.Podman([]string{"images", ALPINE, "-q", "--no-trunc"})
+ setup.WaitWithDefaultTimeout()
+ Expect(setup).Should(Exit(0))
+ shortImageID := strings.Split(setup.OutputToString(), ":")[1]
+
+ rmi := podmanTest.Podman([]string{"rmi", ALPINE})
+ rmi.WaitWithDefaultTimeout()
+ Expect(rmi).Should(Exit(0))
+
+ pull := podmanTest.Podman([]string{"pull", "-q", ALPINE})
+ pull.WaitWithDefaultTimeout()
+ Expect(pull).Should(Exit(0))
+
+ Expect(pull.OutputToString()).To(ContainSubstring(shortImageID))
+ })
+
+ It("podman pull check all tags", func() {
+ session := podmanTest.Podman([]string{"pull", "--all-tags", "k8s.gcr.io/pause"})
+ session.WaitWithDefaultTimeout()
+ Expect(session).Should(Exit(0))
+
+ session = podmanTest.Podman([]string{"images"})
+ session.WaitWithDefaultTimeout()
+ Expect(session).Should(Exit(0))
+ Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 4))
+ })
+
+ It("podman pull from docker with nonexistent --authfile", func() {
+ session := podmanTest.Podman([]string{"pull", "--authfile", "/tmp/nonexistent", ALPINE})
+ session.WaitWithDefaultTimeout()
+ Expect(session).To(ExitWithError())
+ })
+
It("podman pull by digest (image list)", func() {
session := podmanTest.Podman([]string{"pull", "--arch=arm64", ALPINELISTDIGEST})
session.WaitWithDefaultTimeout()
@@ -362,42 +398,6 @@ var _ = Describe("Podman pull", func() {
Expect(session.LineInOutputContainsTag(filepath.Join("localhost", dirpath), "latest")).To(BeTrue())
})
- It("podman pull check quiet", func() {
- err := podmanTest.RestoreArtifact(ALPINE)
- Expect(err).ToNot(HaveOccurred())
- setup := podmanTest.Podman([]string{"images", ALPINE, "-q", "--no-trunc"})
- setup.WaitWithDefaultTimeout()
- Expect(setup).Should(Exit(0))
- shortImageID := strings.Split(setup.OutputToString(), ":")[1]
-
- rmi := podmanTest.Podman([]string{"rmi", ALPINE})
- rmi.WaitWithDefaultTimeout()
- Expect(rmi).Should(Exit(0))
-
- pull := podmanTest.Podman([]string{"pull", "-q", ALPINE})
- pull.WaitWithDefaultTimeout()
- Expect(pull).Should(Exit(0))
-
- Expect(pull.OutputToString()).To(ContainSubstring(shortImageID))
- })
-
- It("podman pull check all tags", func() {
- session := podmanTest.Podman([]string{"pull", "--all-tags", "k8s.gcr.io/pause"})
- session.WaitWithDefaultTimeout()
- Expect(session).Should(Exit(0))
-
- session = podmanTest.Podman([]string{"images"})
- session.WaitWithDefaultTimeout()
- Expect(session).Should(Exit(0))
- Expect(len(session.OutputToStringArray())).To(BeNumerically(">", 4))
- })
-
- It("podman pull from docker with nonexistent --authfile", func() {
- session := podmanTest.Podman([]string{"pull", "--authfile", "/tmp/nonexistent", ALPINE})
- session.WaitWithDefaultTimeout()
- Expect(session).To(ExitWithError())
- })
-
It("podman pull + inspect from unqualified-search registry", func() {
// Regression test for #6381:
// Make sure that `pull shortname` and `inspect shortname`