Merge pull request #31549 from cyphar/TestDaemonCommand-fix

cmd: docker: fix TestDaemonCommand
Upstream-commit: 6753b3bef3176fca25c512102c07b720374e3cfb
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`")