From 9694209241074c10d4cc625b24dfedcb2387de93 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 8 Aug 2014 16:27:13 -0700 Subject: [PATCH] Fix hack in old integration test for new init Signed-off-by: Michael Crosby --- integration/runtime_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/integration/runtime_test.go b/integration/runtime_test.go index 45a2a29cf5..5148af01ba 100644 --- a/integration/runtime_test.go +++ b/integration/runtime_test.go @@ -20,8 +20,8 @@ import ( "github.com/docker/docker/engine" "github.com/docker/docker/image" "github.com/docker/docker/nat" + "github.com/docker/docker/reexec" "github.com/docker/docker/runconfig" - "github.com/docker/docker/sysinit" "github.com/docker/docker/utils" ) @@ -94,8 +94,7 @@ func init() { os.Setenv("DOCKER_TMPDIR", unitTestDockerTmpdir) // Hack to run sys init during unit testing - if selfPath := utils.SelfPath(); strings.Contains(selfPath, ".dockerinit") { - sysinit.SysInit() + if reexec.Init() { return }