forked from pool/docker
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
|
From dd7159060f60ea04007c069df189a29fda2c655f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aleksa Sarai <asarai@suse.de>
|
||
|
|
Date: Sun, 5 Mar 2017 15:25:11 +1100
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
---
|
||
|
|
cmd/docker/daemon_none.go | 6 ++++--
|
||
|
|
cmd/docker/daemon_none_test.go | 2 +-
|
||
|
|
2 files changed, 5 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/cmd/docker/daemon_none.go b/cmd/docker/daemon_none.go
|
||
|
|
index 65f9f37be22f..6fbd00012526 100644
|
||
|
|
--- a/cmd/docker/daemon_none.go
|
||
|
|
+++ b/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()
|
||
|
|
},
|
||
|
|
diff --git a/cmd/docker/daemon_none_test.go b/cmd/docker/daemon_none_test.go
|
||
|
|
index 32032fe1b344..bd42add98696 100644
|
||
|
|
--- a/cmd/docker/daemon_none_test.go
|
||
|
|
+++ b/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`")
|
||
|
|
--
|
||
|
|
2.12.0
|
||
|
|
|