opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-09 23:27:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19806 from vrothberg/vendor-common

Browse Source 
vendor containers/common@12405381ff
This commit is contained in:
OpenShift Merge Robot
2023-08-30 22:14:35 +02:00
committed by GitHub
parent 4051a8a23f e66c04c1f7
commit bd7579a62a
6 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/load_test.go
View File

@@ -249,11 +249,7 @@ var _ = Describe("Podman load", func() {
load := podmanTest.Podman([]string{"load", "-i", outfile})
load.WaitWithDefaultTimeout()
Expect(load).Should(Exit(0))
result := podmanTest.Podman([]string{"images", "load:latest"})
result.WaitWithDefaultTimeout()
Expect(result.OutputToString()).To(Not(ContainSubstring("docker")))
Expect(result.OutputToString()).To(ContainSubstring("localhost"))
Expect(load.OutputToString()).To(ContainSubstring("Loaded image: sha256:"))
})
It("podman load xz compressed image", func() {

11
test/e2e/pull_test.go
View File

@@ -418,7 +418,8 @@ var _ = Describe("Podman pull", func() {
dirpath := filepath.Join(podmanTest.TempDir, "cirros")
err = os.MkdirAll(dirpath, os.ModePerm)
Expect(err).ToNot(HaveOccurred())
imgPath := fmt.Sprintf("oci:%s", dirpath)
imgName := "localhost/name:tag"
imgPath := fmt.Sprintf("oci:%s:%s", dirpath, imgName)
session := podmanTest.Podman([]string{"push", "cirros", imgPath})
session.WaitWithDefaultTimeout()
@@ -429,10 +430,9 @@ var _ = Describe("Podman pull", func() {
session = podmanTest.Podman([]string{"pull", imgPath})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
session = podmanTest.Podman([]string{"images"})
session = podmanTest.Podman([]string{"image", "exists", imgName})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(session.LineInOutputContainsTag(filepath.Join("localhost", dirpath), "latest")).To(BeTrue())
})
It("podman pull + inspect from unqualified-search registry", func() {
@@ -648,11 +648,12 @@ var _ = Describe("Podman pull", func() {
podmanTest.AddImageToRWStore(ALPINE)
bbdir := filepath.Join(podmanTest.TempDir, "busybox-oci")
imgPath := fmt.Sprintf("oci:%s", bbdir)
imgName := "localhost/name:tag"
imgPath := fmt.Sprintf("oci:%s:%s", bbdir, imgName)
session := decryptionTestHelper(imgPath)
Expect(session.LineInOutputContainsTag(filepath.Join("localhost", bbdir), "latest")).To(BeTrue())
Expect(session.LineInOutputContainsTag("localhost/name", "tag")).To(BeTrue())
})
It("From local registry", func() {