add TEST env var during tests and silenced parserun during tests

Upstream-commit: eee6d3dae96afbcb1456b4a84f05f1aac44e5598
Component: engine

components/engine/a_test.go

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

components/engine/container.go

@@ -107,7 +107,7 @@ type KeyValuePair struct {
 
 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")
-	if len(args) > 0 && args[0] != "--help" {
+	if os.Getenv("TEST") != "" {
 		cmd.SetOutput(ioutil.Discard)
 		cmd.Usage = nil
 	}