From 6d4cd446fe1df4074f44267c4c5b0134bcedc65c Mon Sep 17 00:00:00 2001 From: "Daniel, Dao Quang Minh" Date: Wed, 1 Oct 2014 11:13:59 -0400 Subject: [PATCH] instantiate the builder job in commit integration tests Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh (github: dqminh) Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh (github: rhatdan) --- integration/api_test.go | 3 +++ integration/server_test.go | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/integration/api_test.go b/integration/api_test.go index 8daa4d46f3..e978c311bf 100644 --- a/integration/api_test.go +++ b/integration/api_test.go @@ -16,6 +16,7 @@ import ( "github.com/docker/docker/api" "github.com/docker/docker/api/server" + "github.com/docker/docker/builder" "github.com/docker/docker/engine" "github.com/docker/docker/runconfig" "github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" @@ -158,6 +159,8 @@ func TestGetContainersTop(t *testing.T) { func TestPostCommit(t *testing.T) { eng := NewTestEngine(t) + b := &builder.BuilderJob{Engine: eng} + b.Install() defer mkDaemonFromEngine(eng, t).Nuke() // Create a container and remove a file diff --git a/integration/server_test.go b/integration/server_test.go index 1384973306..6d12ad35ad 100644 --- a/integration/server_test.go +++ b/integration/server_test.go @@ -5,6 +5,7 @@ import ( "testing" "time" + "github.com/docker/docker/builder" "github.com/docker/docker/engine" ) @@ -22,6 +23,8 @@ func TestCreateNumberHostname(t *testing.T) { func TestCommit(t *testing.T) { eng := NewTestEngine(t) + b := &builder.BuilderJob{Engine: eng} + b.Install() defer mkDaemonFromEngine(eng, t).Nuke() config, _, _, err := parseRun([]string{unitTestImageID, "/bin/cat"}) @@ -42,6 +45,8 @@ func TestCommit(t *testing.T) { func TestMergeConfigOnCommit(t *testing.T) { eng := NewTestEngine(t) + b := &builder.BuilderJob{Engine: eng} + b.Install() runtime := mkDaemonFromEngine(eng, t) defer runtime.Nuke()