Fix machine list: --format implies --noheading

It seems like previously if --format was changed then listFlag.noHeading is changed accordingly
however printHeader is used to determine whether to print header or not.

This patch fixes that problem.

Signed-off-by: Boaz Shuster <boaz.shuster.github@gmail.com>

2 files changed, 11 insertions, 2 deletions

diff --git a/cmd/podman/machine/list.go b/cmd/podman/machine/list.go
index bb14d4a67..1ffb8690c 100644
--- a/cmd/podman/machine/list.go
+++ b/cmd/podman/machine/list.go
@@ -138,7 +138,7 @@ func outputTemplate(cmd *cobra.Command, responses []*ListReporter) error {
 	switch {
 	case cmd.Flags().Changed("format"):
 		row = cmd.Flag("format").Value.String()
-		listFlag.noHeading = !report.HasTable(row)
+		printHeader = report.HasTable(row)
 		row = report.NormalizeFormat(row)
 	default:
 		row = cmd.Flag("format").Value.String()
diff --git a/pkg/machine/e2e/list_test.go b/pkg/machine/e2e/list_test.go
index 1c8c6ac81..00020cf4a 100644
--- a/pkg/machine/e2e/list_test.go
+++ b/pkg/machine/e2e/list_test.go
@@ -116,7 +116,7 @@ var _ = Describe("podman machine list", func() {
 
 		// go format
 		list := new(listMachine)
-		listSession, err := mb.setCmd(list.withFormat("{{.Name}}").withNoHeading()).run()
+		listSession, err := mb.setCmd(list.withFormat("{{.Name}}")).run()
 		Expect(err).NotTo(HaveOccurred())
 		Expect(listSession).To(Exit(0))
 		Expect(len(listSession.outputToStringSlice())).To(Equal(1))
@@ -135,6 +135,15 @@ var _ = Describe("podman machine list", func() {
 		var listResponse []*machine.ListReporter
 		err = jsoniter.Unmarshal(listSession.Bytes(), &listResponse)
 		Expect(err).To(BeNil())
+
+		// table format includes the header
+		list = new(listMachine)
+		listSession3, err3 := mb.setCmd(list.withFormat("table {{.Name}}")).run()
+		Expect(err3).NotTo(HaveOccurred())
+		Expect(listSession3).To(Exit(0))
+		listNames3 := listSession3.outputToStringSlice()
+		Expect(len(listNames3)).To(Equal(2))
+		Expect(listNames3).To(ContainSubstring("NAME"))
 	})
 })