diff options
Diffstat (limited to 'test/e2e/secret_test.go')
| -rw-r--r-- | test/e2e/secret_test.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/test/e2e/secret_test.go b/test/e2e/secret_test.go index 8bbc889d7..661ebbdc0 100644 --- a/test/e2e/secret_test.go +++ b/test/e2e/secret_test.go @@ -78,7 +78,7 @@ var _ = Describe("Podman secret", func() { inspect := podmanTest.Podman([]string{"secret", "inspect", secrID}) inspect.WaitWithDefaultTimeout() Expect(inspect).Should(Exit(0)) - Expect(inspect.IsJSONOutputValid()).To(BeTrue()) + Expect(inspect.OutputToString()).To(BeValidJSON()) }) It("podman secret inspect with --format", func() { @@ -115,7 +115,7 @@ var _ = Describe("Podman secret", func() { inspect := podmanTest.Podman([]string{"secret", "inspect", secrID, secrID2}) inspect.WaitWithDefaultTimeout() Expect(inspect).Should(Exit(0)) - Expect(inspect.IsJSONOutputValid()).To(BeTrue()) + Expect(inspect.OutputToString()).To(BeValidJSON()) }) It("podman secret inspect bogus", func() { @@ -141,7 +141,7 @@ var _ = Describe("Podman secret", func() { list := podmanTest.Podman([]string{"secret", "ls"}) list.WaitWithDefaultTimeout() Expect(list).Should(Exit(0)) - Expect(len(list.OutputToStringArray())).To(Equal(2)) + Expect(list.OutputToStringArray()).To(HaveLen(2)) }) @@ -158,7 +158,7 @@ var _ = Describe("Podman secret", func() { list.WaitWithDefaultTimeout() Expect(list).Should(Exit(0)) - Expect(len(list.OutputToStringArray())).To(Equal(2), list.OutputToString()) + Expect(list.OutputToStringArray()).To(HaveLen(2), list.OutputToString()) }) It("podman secret rm", func() { @@ -179,7 +179,7 @@ var _ = Describe("Podman secret", func() { session = podmanTest.Podman([]string{"secret", "ls"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(len(session.OutputToStringArray())).To(Equal(1)) + Expect(session.OutputToStringArray()).To(HaveLen(1)) }) It("podman secret rm --all", func() { @@ -201,14 +201,13 @@ var _ = Describe("Podman secret", func() { session = podmanTest.Podman([]string{"secret", "ls"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(len(session.OutputToStringArray())).To(Equal(1)) + Expect(session.OutputToStringArray()).To(HaveLen(1)) }) It("podman secret creates from environment variable", func() { // no env variable set, should fail session := podmanTest.Podman([]string{"secret", "create", "--env", "a", "MYENVVAR"}) session.WaitWithDefaultTimeout() - secrID := session.OutputToString() Expect(session).To(ExitWithError()) os.Setenv("MYENVVAR", "somedata") @@ -218,7 +217,7 @@ var _ = Describe("Podman secret", func() { session = podmanTest.Podman([]string{"secret", "create", "--env", "a", "MYENVVAR"}) session.WaitWithDefaultTimeout() - secrID = session.OutputToString() + secrID := session.OutputToString() Expect(session).Should(Exit(0)) inspect := podmanTest.Podman([]string{"secret", "inspect", "--format", "{{.ID}}", secrID}) |