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>

3 files changed, 18 insertions, 11 deletions

diff --git a/test/apiv2/python/rest_api/test_v2_0_0_image.py b/test/apiv2/python/rest_api/test_v2_0_0_image.py
index 59dcea87f..3e8ecb1ef 100644
--- a/test/apiv2/python/rest_api/test_v2_0_0_image.py
+++ b/test/apiv2/python/rest_api/test_v2_0_0_image.py
@@ -89,9 +89,15 @@ class ImageTestCase(APITestCase):
 
     def test_create(self):
         r = requests.post(
-            self.podman_url + "/v1.40/images/create?fromImage=alpine&platform=linux/amd64/v8", timeout=15)
+            self.podman_url + "/v1.40/images/create?fromImage=alpine&platform=linux/amd64/v8",
+            timeout=15,
+        )
         self.assertEqual(r.status_code, 200, r.text)
-        r = requests.post(self.podman_url + "/v1.40/images/create?fromSrc=-&repo=fedora&message=testing123&platform=linux/amd64", timeout=15)
+        r = requests.post(
+            self.podman_url
+            + "/v1.40/images/create?fromSrc=-&repo=fedora&message=testing123&platform=linux/amd64",
+            timeout=15,
+        )
         self.assertEqual(r.status_code, 200, r.text)
 
     def test_search_compat(self):
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))
 	})
diff --git a/test/system/010-images.bats b/test/system/010-images.bats
index 2d7ac1e0c..649987dfd 100644
--- a/test/system/010-images.bats
+++ b/test/system/010-images.bats
@@ -19,21 +19,22 @@ load helpers
 
 @test "podman images - custom formats" {
     tests="
---format {{.ID}}                  |        [0-9a-f]\\\{12\\\}
---format {{.ID}} --no-trunc       | sha256:[0-9a-f]\\\{64\\\}
---format {{.Repository}}:{{.Tag}} | $PODMAN_TEST_IMAGE_FQN
---format {{.Labels.created_by}}   | test/system/build-testimage
---format {{.Labels.created_at}}   | 20[0-9-]\\\+T[0-9:]\\\+Z
+{{.ID}}                  |        [0-9a-f]\\\{12\\\}
+{{.ID| upper}}           |        [0-9A-F]\\\{12\\\}
+{{.Repository}}:{{.Tag}} | $PODMAN_TEST_IMAGE_FQN
+{{.Labels.created_by}}   | test/system/build-testimage
+{{.Labels.created_at}}   | 20[0-9-]\\\+T[0-9:]\\\+Z
 "
 
     parse_table "$tests" | while read fmt expect; do
-        run_podman images $fmt
+        run_podman images --format "$fmt"
         is "$output" "$expect\$" "podman images $fmt"
     done
 
+    run_podman images --format "{{.ID}}" --no-trunc
+    is "$output" "sha256:[0-9a-f]\\{64\\}\$" "podman images --no-trunc"
 }
 
-
 @test "podman images - json" {
     # 'created': podman includes fractional seconds, podman-remote does not
     tests="