1. docker
  2. Commit 6d4cd446fe1df4074f44267c4c5b0134bcedc65c
Browse code

instantiate the builder job in commit integration tests

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: rhatdan)

Daniel, Dao Quang Minh authored on 2014/10/02 00:13:59
Showing 2 changed files
integration/api_test.go
History View file @ 6d4cd44
... ... 
@@ -16,6 +16,7 @@ import (
16 16
17 17 
 	"github.com/docker/docker/api"
18 18 
 	"github.com/docker/docker/api/server"
19 
+	"github.com/docker/docker/builder"
19 20 
 	"github.com/docker/docker/engine"
20 21 
 	"github.com/docker/docker/runconfig"
21 22 
 	"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar"
... ... 
@@ -158,6 +159,8 @@ func TestGetContainersTop(t *testing.T) {
158 158
159 159 
 func TestPostCommit(t *testing.T) {
160 160 
 	eng := NewTestEngine(t)
161 
+	b := &builder.BuilderJob{Engine: eng}
162 
+	b.Install()
161 163 
 	defer mkDaemonFromEngine(eng, t).Nuke()
162 164
163 165 
 	// Create a container and remove a file
integration/server_test.go
History View file @ 6d4cd44
... ... 
@@ -5,6 +5,7 @@ import (
5 5 
 	"testing"
6 6 
 	"time"
7 7
8 
+	"github.com/docker/docker/builder"
8 9 
 	"github.com/docker/docker/engine"
9 10 
 )
10 11
... ... 
@@ -22,6 +23,8 @@ func TestCreateNumberHostname(t *testing.T) {
22 22
23 23 
 func TestCommit(t *testing.T) {
24 24 
 	eng := NewTestEngine(t)
25 
+	b := &builder.BuilderJob{Engine: eng}
26 
+	b.Install()
25 27 
 	defer mkDaemonFromEngine(eng, t).Nuke()
26 28
27 29 
 	config, _, _, err := parseRun([]string{unitTestImageID, "/bin/cat"})
... ... 
@@ -42,6 +45,8 @@ func TestCommit(t *testing.T) {
42 42
43 43 
 func TestMergeConfigOnCommit(t *testing.T) {
44 44 
 	eng := NewTestEngine(t)
45 
+	b := &builder.BuilderJob{Engine: eng}
46 
+	b.Install()
45 47 
 	runtime := mkDaemonFromEngine(eng, t)
46 48 
 	defer runtime.Nuke()
47 49