summaryrefslogtreecommitdiff
path: root/test/e2e/tree_test.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-30 21:56:26 +0200
committerGitHub <noreply@github.com>2019-05-30 21:56:26 +0200
commitb5b461ac28629c95795f0dee3fc6c804f2a47186 (patch)
tree21dd4ab48159d6f77570d2ac8e11acec35bc67cb /test/e2e/tree_test.go
parent2dcfd3df0b58463b050385c0ccd7929c540bce21 (diff)
parentf610a485c1bca7a78d3b2f70e2005b79668fab2f (diff)
downloadpodman-b5b461ac28629c95795f0dee3fc6c804f2a47186.tar.gz
podman-b5b461ac28629c95795f0dee3fc6c804f2a47186.tar.bz2
podman-b5b461ac28629c95795f0dee3fc6c804f2a47186.zip
Merge pull request #3147 from baude/testimagecache
use imagecaches for local tests
Diffstat (limited to 'test/e2e/tree_test.go')
-rw-r--r--test/e2e/tree_test.go13
1 files changed, 7 insertions, 6 deletions
diff --git a/test/e2e/tree_test.go b/test/e2e/tree_test.go
index 9740adada..2db7aeb5e 100644
--- a/test/e2e/tree_test.go
+++ b/test/e2e/tree_test.go
@@ -22,7 +22,8 @@ var _ = Describe("Podman image tree", func() {
os.Exit(1)
}
podmanTest = PodmanTestCreate(tempdir)
- podmanTest.RestoreAllArtifacts()
+ podmanTest.Setup()
+ podmanTest.RestoreArtifact(BB)
})
AfterEach(func() {
@@ -36,7 +37,7 @@ var _ = Describe("Podman image tree", func() {
if podmanTest.RemoteTest {
Skip("Does not work on remote client")
}
- session := podmanTest.Podman([]string{"pull", "docker.io/library/busybox:latest"})
+ session := podmanTest.PodmanNoCache([]string{"pull", "docker.io/library/busybox:latest"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
@@ -47,17 +48,17 @@ ENV foo=bar
`
podmanTest.BuildImage(dockerfile, "test:latest", "true")
- session = podmanTest.Podman([]string{"image", "tree", "test:latest"})
+ session = podmanTest.PodmanNoCache([]string{"image", "tree", "test:latest"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- session = podmanTest.Podman([]string{"image", "tree", "--whatrequires", "docker.io/library/busybox:latest"})
+ session = podmanTest.PodmanNoCache([]string{"image", "tree", "--whatrequires", "docker.io/library/busybox:latest"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- session = podmanTest.Podman([]string{"rmi", "test:latest"})
+ session = podmanTest.PodmanNoCache([]string{"rmi", "test:latest"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- session = podmanTest.Podman([]string{"rmi", "docker.io/library/busybox:latest"})
+ session = podmanTest.PodmanNoCache([]string{"rmi", "docker.io/library/busybox:latest"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
})