From b7380a7c367246fa50b2380a99dbff39c4dc78d0 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Mon, 10 Jan 2022 13:47:12 +0100
Subject: vendor c/common
Also update the e2e pull test to account for the changes when pulling
from the dir transport. Images pulled via the dir transport are not
tagged anymore; the path is not a reliable source.
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
test/e2e/pull_test.go | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'test/e2e')
diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go
index f22acca6e..38afff9bd 100644
--- a/test/e2e/pull_test.go
+++ b/test/e2e/pull_test.go
@@ -354,13 +354,13 @@ var _ = Describe("Podman pull", func() {
session = podmanTest.Podman([]string{"rmi", "cirros"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
- session = podmanTest.Podman([]string{"pull", imgPath})
+ session = podmanTest.Podman([]string{"run", imgPath, "ls"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
- session = podmanTest.Podman([]string{"images"})
+ // Note that reference is not preserved in dir.
+ session = podmanTest.Podman([]string{"image", "exists", "cirros"})
session.WaitWithDefaultTimeout()
- Expect(session).Should(Exit(0))
- Expect(session.LineInOutputContainsTag(filepath.Join("localhost", dirpath), "latest")).To(BeTrue())
+ Expect(session).Should(Exit(1))
})
It("podman pull from local OCI directory", func() {
--
cgit v1.2.3-54-g00ecf