From 6ac8a24db4ab3e2bbc85feca2bee8cb1c868c7f6 Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Thu, 26 Apr 2018 11:29:02 -0400 Subject: Add --default-mounts-file hidden flag The hidden flag is used to override the path of the default mounts file for testing purposes. Also modified the secrets pkg to allow for this override to happen. Signed-off-by: umohnani8 Closes: #678 Approved by: mheon --- test/e2e/run_test.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index cfeabe6a0..5eb21c433 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -260,7 +260,7 @@ var _ = Describe("Podman run", func() { }) It("podman run with secrets", func() { - containersDir := "/usr/share/containers" + containersDir := filepath.Join(podmanTest.TempDir, "containers") err := os.MkdirAll(containersDir, 0755) Expect(err).To(BeNil()) @@ -288,18 +288,15 @@ var _ = Describe("Podman run", func() { execSession.WaitWithDefaultTimeout() Expect(execSession.ExitCode()).To(Equal(0)) - session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "cat", "/run/secrets/test.txt"}) + session := podmanTest.Podman([]string{"--default-mounts-file=" + mountsFile, "run", "--rm", ALPINE, "cat", "/run/secrets/test.txt"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) Expect(session.OutputToString()).To(Equal(secretsString)) - session = podmanTest.Podman([]string{"run", "--rm", ALPINE, "ls", "/run/secrets/mysymlink"}) + session = podmanTest.Podman([]string{"--default-mounts-file=" + mountsFile, "run", "--rm", ALPINE, "ls", "/run/secrets/mysymlink"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) Expect(session.OutputToString()).To(ContainSubstring("key.pem")) - - err = os.RemoveAll(containersDir) - Expect(err).To(BeNil()) }) It("podman run with FIPS mode secrets", func() { -- cgit v1.2.3-54-g00ecf