docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix hack in old integration test for new init 

Signed-off-by: Michael Crosby <michael@docker.com>
This commit is contained in:
Michael Crosby 2014-08-08 16:27:13 -07:00
parent 29af9c14e4
commit 9694209241
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
integration/runtime_test.go
View File

@ -20,8 +20,8 @@ import (
"github.com/docker/docker/engine" "github.com/docker/docker/engine"
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/docker/docker/nat" "github.com/docker/docker/nat"
"github.com/docker/docker/reexec"
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"
"github.com/docker/docker/sysinit"
"github.com/docker/docker/utils" "github.com/docker/docker/utils"
) )
@ -94,8 +94,7 @@ func init() {
os.Setenv("DOCKER_TMPDIR", unitTestDockerTmpdir) os.Setenv("DOCKER_TMPDIR", unitTestDockerTmpdir)
// Hack to run sys init during unit testing // Hack to run sys init during unit testing
if selfPath := utils.SelfPath(); strings.Contains(selfPath, ".dockerinit") { if reexec.Init() {
sysinit.SysInit()
return return
} }