Skip to content

Commit

Permalink
ExitWithError() - more low-hanging fruit
Browse files Browse the repository at this point in the history 
Followup to #22270: wherever possible/practical, extend command
error checks to include explicit exit status codes and error strings.

More low-hanging fruit: small reviewable chunks

Signed-off-by: Ed Santiago <santiago@redhat.com>
  • Loading branch information
@edsantiago
edsantiago committed Apr 24, 2024
1 parent f82c7ce commit 80c3a22
Showing 1 changed file with 15 additions and 28 deletions.
43 changes: 15 additions & 28 deletions test/e2e/login_logout_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ var _ = Describe("Podman login and logout", func() {

session = podmanTest.Podman([]string{"push", "-q", ALPINE, testImg})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(ContainSubstring(": authentication required"))
Expect(session).To(ExitWithError(125, ": authentication required"))
})

It("podman login and logout without registry parameter", func() {
Expand Down Expand Up @@ -167,8 +166,7 @@ var _ = Describe("Podman login and logout", func() {
// push should fail with nonexistent authfile
session = podmanTest.Podman([]string{"push", "-q", "--authfile", "/tmp/nonexistent", ALPINE, testImg})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(Equal("Error: credential file is not accessible: faccessat /tmp/nonexistent: no such file or directory"))
Expect(session).To(ExitWithError(125, "credential file is not accessible: faccessat /tmp/nonexistent: no such file or directory"))

session = podmanTest.Podman([]string{"push", "-q", "--authfile", authFile, ALPINE, testImg})
session.WaitWithDefaultTimeout()
Expand All @@ -181,8 +179,8 @@ var _ = Describe("Podman login and logout", func() {
// logout should fail with nonexistent authfile
session = podmanTest.Podman([]string{"logout", "--authfile", "/tmp/nonexistent", server})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(Equal("Error: credential file is not accessible: faccessat /tmp/nonexistent: no such file or directory"))
Expect(session).To(ExitWithError(125, "credential file is not accessible: faccessat /tmp/nonexistent: no such file or directory"))

session = podmanTest.Podman([]string{"logout", "--authfile", authFile, server})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
Expand All @@ -204,8 +202,7 @@ var _ = Describe("Podman login and logout", func() {
// logout should fail with nonexistent authfile
session = podmanTest.Podman([]string{"logout", "--compat-auth-file", "/tmp/nonexistent", server})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(Equal("Error: credential file is not accessible: faccessat /tmp/nonexistent: no such file or directory"))
Expect(session).To(ExitWithError(125, "credential file is not accessible: faccessat /tmp/nonexistent: no such file or directory"))

// inconsistent command line flags are rejected
// Pre-create the files to make sure we are not hitting the “file not found” path
Expand All @@ -218,13 +215,11 @@ var _ = Describe("Podman login and logout", func() {
session = podmanTest.Podman([]string{"login", "--username", "podmantest", "--password", "test",
"--authfile", authFile, "--compat-auth-file", compatAuthFile, server})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(Equal("Error: options for paths to the credential file and to the Docker-compatible credential file can not be set simultaneously"))
Expect(session).To(ExitWithError(125, "options for paths to the credential file and to the Docker-compatible credential file can not be set simultaneously"))

session = podmanTest.Podman([]string{"logout", "--authfile", authFile, "--compat-auth-file", compatAuthFile, server})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(Equal("Error: options for paths to the credential file and to the Docker-compatible credential file can not be set simultaneously"))
Expect(session).To(ExitWithError(125, "options for paths to the credential file and to the Docker-compatible credential file can not be set simultaneously"))
})

It("podman manifest with --authfile", func() {
Expand All @@ -243,8 +238,7 @@ var _ = Describe("Podman login and logout", func() {

session = podmanTest.Podman([]string{"manifest", "push", "-q", testImg})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(ContainSubstring(": authentication required"))
Expect(session).To(ExitWithError(125, ": authentication required"))

session = podmanTest.Podman([]string{"manifest", "push", "-q", "--authfile", authFile, testImg})
session.WaitWithDefaultTimeout()
Expand All @@ -257,8 +251,7 @@ var _ = Describe("Podman login and logout", func() {

session = podmanTest.Podman([]string{"manifest", "inspect", testImg})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(ContainSubstring(": authentication required"))
Expect(session).To(ExitWithError(125, ": authentication required"))

session = podmanTest.Podman([]string{"manifest", "inspect", "--authfile", authFile, testImg})
session.WaitWithDefaultTimeout()
Expand Down Expand Up @@ -335,8 +328,7 @@ var _ = Describe("Podman login and logout", func() {

session = podmanTest.Podman([]string{"push", "-q", ALPINE, "localhost:9001/test-alpine"})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(ContainSubstring("/test-alpine: authentication required"))
Expect(session).To(ExitWithError(125, "/test-alpine: authentication required"))

session = podmanTest.Podman([]string{"login", "--username", "podmantest", "--password", "test", "localhost:9001"})
session.WaitWithDefaultTimeout()
Expand All @@ -356,8 +348,7 @@ var _ = Describe("Podman login and logout", func() {

session = podmanTest.Podman([]string{"push", "-q", ALPINE, testImg})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(ContainSubstring("/test-alpine: authentication required"))
Expect(session).To(ExitWithError(125, "/test-alpine: authentication required"))

session = podmanTest.Podman([]string{"push", "-q", ALPINE, "localhost:9001/test-alpine"})
session.WaitWithDefaultTimeout()
Expand All @@ -373,13 +364,11 @@ var _ = Describe("Podman login and logout", func() {

session = podmanTest.Podman([]string{"push", "-q", ALPINE, testImg})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(ContainSubstring("/test-alpine: authentication required"))
Expect(session).To(ExitWithError(125, "/test-alpine: authentication required"))

session = podmanTest.Podman([]string{"push", "-q", ALPINE, "localhost:9001/test-alpine"})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(ContainSubstring("/test-alpine: authentication required"))
Expect(session).To(ExitWithError(125, "/test-alpine: authentication required"))
})

It("podman login and logout with repository", func() {
Expand Down Expand Up @@ -532,8 +521,7 @@ var _ = Describe("Podman login and logout", func() {
ALPINE, server + "/podmantest/test-image",
})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(ContainSubstring("/test-image: authentication required"))
Expect(session).To(ExitWithError(125, "/test-image: authentication required"))

session = podmanTest.Podman([]string{
"push", "-q",
Expand Down Expand Up @@ -580,7 +568,6 @@ var _ = Describe("Podman login and logout", func() {
server + "/podmantest/test-alpine",
})
session.WaitWithDefaultTimeout()
Expect(session).To(ExitWithError())
Expect(session.ErrorToString()).To(ContainSubstring("/test-alpine: authentication required"))
Expect(session).To(ExitWithError(125, "/test-alpine: authentication required"))
})
})

0 comments on commit 80c3a22

Please sign in to comment.