From d89a877aebb4a2a179ead115755a8a0e605eb53b Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 19 Aug 2013 13:47:38 +0000 Subject: [PATCH 1/3] add TEST env var during tests and silenced parserun during tests Upstream-commit: eee6d3dae96afbcb1456b4a84f05f1aac44e5598 Component: engine --- components/engine/a_test.go | 10 ++++++++++ components/engine/container.go | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 components/engine/a_test.go diff --git a/components/engine/a_test.go b/components/engine/a_test.go new file mode 100644 index 0000000000..022978387f --- /dev/null +++ b/components/engine/a_test.go @@ -0,0 +1,10 @@ +package docker + +import ( + "os" + "testing" +) + +func Test(t *testing.T) { + os.Setenv("TEST", "1") +} diff --git a/components/engine/container.go b/components/engine/container.go index 9099d90f6f..39c19c53d4 100644 --- a/components/engine/container.go +++ b/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 } From 6b54138e54f517fb272861d91650fff8a6a21cab Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 29 Aug 2013 22:55:24 +0000 Subject: [PATCH 2/3] use init function Upstream-commit: 740a97f1a836be17ab39e8496b7372900782c20b Component: engine --- components/engine/a_test.go | 10 ---------- components/engine/runtime_test.go | 2 ++ 2 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 components/engine/a_test.go diff --git a/components/engine/a_test.go b/components/engine/a_test.go deleted file mode 100644 index 022978387f..0000000000 --- a/components/engine/a_test.go +++ /dev/null @@ -1,10 +0,0 @@ -package docker - -import ( - "os" - "testing" -) - -func Test(t *testing.T) { - os.Setenv("TEST", "1") -} diff --git a/components/engine/runtime_test.go b/components/engine/runtime_test.go index 83ada6dd21..a65d962fa6 100644 --- a/components/engine/runtime_test.go +++ b/components/engine/runtime_test.go @@ -72,6 +72,8 @@ func layerArchive(tarfile string) (io.Reader, error) { } func init() { + os.Setenv("TEST", "1") + // Hack to run sys init during unit testing if selfPath := utils.SelfPath(); selfPath == "/sbin/init" || selfPath == "/.dockerinit" { SysInit() From 068b4e2c39779b987765eb70777975fe98acb343 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 29 Aug 2013 22:59:34 +0000 Subject: [PATCH 3/3] remove message during tests Upstream-commit: f159f4710b0c5dac8b71246dddbaee667dd6a702 Component: engine --- components/engine/runtime.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/runtime.go b/components/engine/runtime.go index 13cd6a8e81..002c0fe10a 100644 --- a/components/engine/runtime.go +++ b/components/engine/runtime.go @@ -208,7 +208,7 @@ func (runtime *Runtime) Destroy(container *Container) error { func (runtime *Runtime) restore() error { wheel := "-\\|/" - if os.Getenv("DEBUG") == "" { + if os.Getenv("DEBUG") == "" && os.Getenv("TEST") == "" { fmt.Printf("Loading containers: ") } dir, err := ioutil.ReadDir(runtime.repository) @@ -218,7 +218,7 @@ func (runtime *Runtime) restore() error { for i, v := range dir { id := v.Name() container, err := runtime.Load(id) - if i%21 == 0 && os.Getenv("DEBUG") == "" { + if i%21 == 0 && os.Getenv("DEBUG") == "" && os.Getenv("TEST") == "" { fmt.Printf("\b%c", wheel[i%4]) } if err != nil { @@ -227,7 +227,7 @@ func (runtime *Runtime) restore() error { } utils.Debugf("Loaded container %v", container.ID) } - if os.Getenv("DEBUG") == "" { + if os.Getenv("DEBUG") == "" && os.Getenv("TEST") == "" { fmt.Printf("\bdone.\n") } return nil