diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-19 17:50:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-19 17:50:39 +0200 |
commit | c137e8fcf95b441b5002ec1b39e6cc131471b88a (patch) | |
tree | 6ef408476f33768181bb46a005ce34957261392c /test/e2e | |
parent | b1acc4348184d43def7c63221ee0832505c4b7d1 (diff) | |
parent | 22f55ce406cfea7feebb34b469f11e6cf657c51e (diff) | |
download | podman-c137e8fcf95b441b5002ec1b39e6cc131471b88a.tar.gz podman-c137e8fcf95b441b5002ec1b39e6cc131471b88a.tar.bz2 podman-c137e8fcf95b441b5002ec1b39e6cc131471b88a.zip |
Merge pull request #3849 from openSUSE/directory-pull
Fix directory pull image name for OCI images
Diffstat (limited to 'test/e2e')
-rw-r--r-- | test/e2e/pull_test.go | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index d6e7b44d1..68fcaf133 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -150,6 +150,34 @@ var _ = Describe("Podman pull", func() { session = podmanTest.PodmanNoCache([]string{"pull", imgPath}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) + session = podmanTest.PodmanNoCache([]string{"images"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + Expect(session.LineInOutputContainsTag(filepath.Join("localhost", dirpath), "latest")).To(BeTrue()) + session = podmanTest.PodmanNoCache([]string{"rmi", "alpine"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + }) + + It("podman pull from local OCI directory", func() { + podmanTest.RestoreArtifact(ALPINE) + dirpath := filepath.Join(podmanTest.TempDir, "alpine") + os.MkdirAll(dirpath, os.ModePerm) + imgPath := fmt.Sprintf("oci:%s", dirpath) + + session := podmanTest.PodmanNoCache([]string{"push", "alpine", imgPath}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + session = podmanTest.PodmanNoCache([]string{"rmi", "alpine"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + session = podmanTest.PodmanNoCache([]string{"pull", imgPath}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + session = podmanTest.PodmanNoCache([]string{"images"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + Expect(session.LineInOutputContainsTag(filepath.Join("localhost", dirpath), "latest")).To(BeTrue()) session = podmanTest.PodmanNoCache([]string{"rmi", "alpine"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) |