diff options
author | Matthew Heon <mheon@redhat.com> | 2019-10-17 09:55:37 -0400 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2019-10-18 13:42:31 -0400 |
commit | 6456f6da1742863e8119c0f4b2927f3b1300a942 (patch) | |
tree | c4c6c79075978850895e97441eb6b36d5167f2d7 | |
parent | e7d5ac0e7533668c366fd4b68e1afd7642b01db9 (diff) | |
download | podman-6456f6da1742863e8119c0f4b2927f3b1300a942.tar.gz podman-6456f6da1742863e8119c0f4b2927f3b1300a942.tar.bz2 podman-6456f6da1742863e8119c0f4b2927f3b1300a942.zip |
Show volume options in 'volume inspect'
We initialized the map to show them, but didn't actually copy
them in, so they weren't being displayed.
Signed-off-by: Matthew Heon <mheon@redhat.com>
-rw-r--r-- | libpod/volume_inspect.go | 3 | ||||
-rw-r--r-- | test/e2e/volume_inspect_test.go | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/libpod/volume_inspect.go b/libpod/volume_inspect.go index 87ed9d340..c333b8961 100644 --- a/libpod/volume_inspect.go +++ b/libpod/volume_inspect.go @@ -62,6 +62,9 @@ func (v *Volume) Inspect() (*InspectVolumeData, error) { } data.Scope = v.Scope() data.Options = make(map[string]string) + for k, v := range v.config.Options { + data.Options[k] = v + } data.UID = v.config.UID data.GID = v.config.GID data.ContainerSpecific = v.config.IsCtrSpecific diff --git a/test/e2e/volume_inspect_test.go b/test/e2e/volume_inspect_test.go index 0683c6bbf..5015e0535 100644 --- a/test/e2e/volume_inspect_test.go +++ b/test/e2e/volume_inspect_test.go @@ -2,6 +2,7 @@ package integration import ( "os" + "strings" . "github.com/containers/libpod/test/utils" . "github.com/onsi/ginkgo" @@ -74,4 +75,16 @@ var _ = Describe("Podman volume inspect", func() { Expect(session.OutputToStringArray()[0]).To(Equal(volName1)) Expect(session.OutputToStringArray()[1]).To(Equal(volName2)) }) + + It("inspect volume finds options", func() { + volName := "testvol" + session := podmanTest.Podman([]string{"volume", "create", "--opt", "type=tmpfs", volName}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + + inspect := podmanTest.Podman([]string{"volume", "inspect", volName}) + inspect.WaitWithDefaultTimeout() + Expect(inspect.ExitCode()).To(Equal(0)) + Expect(strings.Contains(inspect.OutputToString(), "tmpfs")).To(BeTrue()) + }) }) |