diff options
author | Jhon Honce <jhonce@redhat.com> | 2021-06-15 10:08:34 -0700 |
---|---|---|
committer | Jhon Honce <jhonce@redhat.com> | 2021-06-16 16:53:48 -0700 |
commit | bd9987239dae148bfd3eea8540d21ae7715faff7 (patch) | |
tree | 9acb4f44f6d3410d2f7bf78aa9a1621f73bef449 /test/e2e | |
parent | e73a7dadac5a8c74c3a020993de94ed88fd6a04e (diff) | |
download | podman-bd9987239dae148bfd3eea8540d21ae7715faff7.tar.gz podman-bd9987239dae148bfd3eea8540d21ae7715faff7.tar.bz2 podman-bd9987239dae148bfd3eea8540d21ae7715faff7.zip |
Scrub podman commands to use report package
Refactor podman commands that have drifted from using
c/common report pkg. Report pkg is needed to implement
go template functions.
Removed obsolete code from podman which exists in c/common.
Latest template library added default newlines and method to
remove them. Incorporated needed changes in c/common PR below.
Depends on https://github.com/containers/common/pull/624
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1855983
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'test/e2e')
-rw-r--r-- | test/e2e/info_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go index f5b70d6bf..83d185be1 100644 --- a/test/e2e/info_test.go +++ b/test/e2e/info_test.go @@ -101,11 +101,11 @@ var _ = Describe("Podman Info", func() { u, err := user.Current() Expect(err).To(BeNil()) + // Cannot use podmanTest.Podman() and test for storage path expect := filepath.Join("/tmp", os.Getenv("HOME"), u.Username, u.Uid, "storage") podmanPath := podmanTest.PodmanTest.PodmanBinary - cmd := exec.Command(podmanPath, "info", "--format", "{{.Store.GraphRoot}}") + cmd := exec.Command(podmanPath, "info", "--format", "{{.Store.GraphRoot -}}") out, err := cmd.CombinedOutput() - fmt.Println(string(out)) Expect(err).To(BeNil()) Expect(string(out)).To(Equal(expect)) }) |