瀏覽代碼

add TEST env var during tests and silenced parserun during tests

Victor Vieux 12 年之前
父節點
當前提交
eee6d3dae9
共有 2 個文件被更改,包括 11 次插入1 次删除
  1. 10 0
      a_test.go
  2. 1 1
      container.go

+ 10 - 0
a_test.go

@@ -0,0 +1,10 @@
+package docker
+
+import (
+	"os"
+	"testing"
+)
+
+func Test(t *testing.T) {
+	os.Setenv("TEST", "1")
+}

+ 1 - 1
container.go

@@ -107,7 +107,7 @@ type KeyValuePair struct {
 
 
 func ParseRun(args []string, capabilities *Capabilities) (*Config, *HostConfig, *flag.FlagSet, error) {
 func ParseRun(args []string, capabilities *Capabilities) (*Config, *HostConfig, *flag.FlagSet, error) {
 	cmd := Subcmd("run", "[OPTIONS] IMAGE [COMMAND] [ARG...]", "Run a command in a new container")
 	cmd := Subcmd("run", "[OPTIONS] IMAGE [COMMAND] [ARG...]", "Run a command in a new container")
-	if len(args) > 0 && args[0] != "--help" {
+	if os.Getenv("TEST") != "" {
 		cmd.SetOutput(ioutil.Discard)
 		cmd.SetOutput(ioutil.Discard)
 		cmd.Usage = nil
 		cmd.Usage = nil
 	}
 	}