Change expected console outputs so that they do not depend on console/platform formatting

Author: Luis Plazas

tests/integration_test.go

@@ -305,11 +305,11 @@ func TestConsoleOutput(t *testing.T) {
 			expectedOutput: []string{
 				"Analyzes an image using the specifed analyzers as indicated via --type flag(s).",
 				"For details on how to specify images, run: container-diff help",
-				"container-diff analyze image [flags]",
-				"-c, --cache-dir string      cache directory base to create .container-diff (default is $HOME).",
-				"-j, --json                  JSON Output defines if the diff should be returned in a human readable format (false) or a JSON (true).",
-				"-w, --output string         output file to write to (default writes to the screen).",
-				"-t, --type multiValueFlag   This flag sets the list of analyzer types to use.",
+				"container-diff",
+				"-c, --cache-dir string",
+				"-j, --json",
+				"-w, --output string",
+				"-t, --type multiValueFlag",
 			},
 		},
 		{
@@ -319,11 +319,11 @@ func TestConsoleOutput(t *testing.T) {
 			expectedOutput: []string{
 				"Analyzes an image using the specifed analyzers as indicated via --type flag(s).",
 				"For details on how to specify images, run: container-diff help",
-				"container-diff analyze image [flags]",
-				"-c, --cache-dir string      cache directory base to create .container-diff (default is $HOME).",
-				"-j, --json                  JSON Output defines if the diff should be returned in a human readable format (false) or a JSON (true).",
-				"-w, --output string         output file to write to (default writes to the screen).",
-				"-t, --type multiValueFlag   This flag sets the list of analyzer types to use.",
+				"container-diff",
+				"-c, --cache-dir string",
+				"-j, --json",
+				"-w, --output string",
+				"-t, --type multiValueFlag",
 			},
 		},
 		{
@@ -333,11 +333,11 @@ func TestConsoleOutput(t *testing.T) {
 			expectedOutput: []string{
 				"container-diff is a CLI tool for analyzing and comparing container images.",
 				"Images can be specified from either a local Docker daemon, or from a remote registry.",
-				"analyze     Analyzes an image: container-diff image",
-				"diff        Compare two images: container-diff image1 image2",
-				"--format string                             Format to output diff in.",
-				"--skip-tls-verify-registry multiValueFlag   Insecure registry ignoring TLS verify to push and pull. Set it repeatedly for multiple registries.",
-				"-v, --verbosity string                          This flag controls the verbosity of container-diff. (default \"warning\")",
+				"analyze",
+				"diff",
+				"--format string",
+				"--skip-tls-verify-registry multiValueFlag",
+				"-v, --verbosity string",
 			},
 		},
 		{
@@ -347,11 +347,11 @@ func TestConsoleOutput(t *testing.T) {
 			expectedOutput: []string{
 				"container-diff is a CLI tool for analyzing and comparing container images.",
 				"Images can be specified from either a local Docker daemon, or from a remote registry.",
-				"analyze     Analyzes an image: container-diff image",
-				"diff        Compare two images: container-diff image1 image2",
-				"--format string                             Format to output diff in.",
-				"--skip-tls-verify-registry multiValueFlag   Insecure registry ignoring TLS verify to push and pull. Set it repeatedly for multiple registries.",
-				"-v, --verbosity string                          This flag controls the verbosity of container-diff. (default \"warning\")",
+				"analyze",
+				"diff",
+				"--format string",
+				"--skip-tls-verify-registry multiValueFlag",
+				"-v, --verbosity string",
 			},
 		},
 		{
@@ -362,10 +362,10 @@ func TestConsoleOutput(t *testing.T) {
 				"Compares two images using the specifed analyzers as indicated via --type flag(s).",
 				"For details on how to specify images, run: container-diff help",
 				"container-diff diff image1 image2 [flags]",
-				"-c, --cache-dir string      cache directory base to create .container-diff (default is $HOME).",
-				"-j, --json                  JSON Output defines if the diff should be returned in a human readable format (false) or a JSON (true).",
-				"-w, --output string         output file to write to (default writes to the screen).",
-				"--skip-tls-verify-registry multiValueFlag   Insecure registry ignoring TLS verify to push and pull. Set it repeatedly for multiple registries.",
+				"-c, --cache-dir string",
+				"-j, --json",
+				"-w, --output string",
+				"--skip-tls-verify-registry multiValueFlag",
 			},
 		},
 		{
@@ -375,10 +375,10 @@ func TestConsoleOutput(t *testing.T) {
 			expectedOutput: []string{
 				"Error: 'diff' requires two images as arguments: container-diff diff [image1] [image2]",
 				"container-diff diff image1 image2 [flags]",
-				"-c, --cache-dir string      cache directory base to create .container-diff (default is $HOME).",
-				"-j, --json                  JSON Output defines if the diff should be returned in a human readable format (false) or a JSON (true).",
-				"-w, --output string         output file to write to (default writes to the screen).",
-				"--skip-tls-verify-registry multiValueFlag   Insecure registry ignoring TLS verify to push and pull. Set it repeatedly for multiple registries.",
+				"-c, --cache-dir string",
+				"-j, --json",
+				"-w, --output string",
+				"--skip-tls-verify-registry multiValueFlag",
 			},
 			producesError: true,
 		},