cmd: docker: fix TestDaemonCommand

In more recent versions of Cobra, `--help` parsing is done before
anything else resulting in TestDaemonCommand not actually passing. I'm
actually unsure if this test ever passed since it appears that !daemon
is not being run as part of the test suite.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: dd7159060f60ea04007c069df189a29fda2c655f
Component: engine

components/engine/cmd/docker/daemon_none.go

@@ -12,8 +12,10 @@ import (
 
 func newDaemonCommand() *cobra.Command {
 	return &cobra.Command{
-		Use:    "daemon",
-		Hidden: true,
+		Use:                "daemon",
+		Hidden:             true,
+		Args:               cobra.ArbitraryArgs,
+		DisableFlagParsing: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runDaemon()
 		},

components/engine/cmd/docker/daemon_none_test.go

@@ -10,7 +10,7 @@ import (
 
 func TestDaemonCommand(t *testing.T) {
 	cmd := newDaemonCommand()
-	cmd.SetArgs([]string{"--help"})
+	cmd.SetArgs([]string{"--version"})
 	err := cmd.Execute()
 
 	assert.Error(t, err, "Please run `dockerd`")