kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

instantiate the builder job in commit integration tests

Browse source 
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)
This commit is contained in:
Daniel, Dao Quang Minh 2014-10-01 11:13:59 -04:00 • committed by Dan Walsh
parent b30257ccf9
commit 6d4cd446fe
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
integration/api_test.go
View file

@ -16,6 +16,7 @@ import (
"github.com/docker/docker/api" "github.com/docker/docker/api"
"github.com/docker/docker/api/server" "github.com/docker/docker/api/server"
"github.com/docker/docker/builder"
"github.com/docker/docker/engine" "github.com/docker/docker/engine"
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"
"github.com/docker/docker/vendor/src/code.google.com/p/go/src/pkg/archive/tar" "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) { func TestPostCommit(t *testing.T) {
eng := NewTestEngine(t) eng := NewTestEngine(t)
b := &builder.BuilderJob{Engine: eng}
b.Install()
defer mkDaemonFromEngine(eng, t).Nuke() defer mkDaemonFromEngine(eng, t).Nuke()
// Create a container and remove a file // Create a container and remove a file

5
integration/server_test.go
View file

@ -5,6 +5,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/docker/docker/builder"
"github.com/docker/docker/engine" "github.com/docker/docker/engine"
) )
@ -22,6 +23,8 @@ func TestCreateNumberHostname(t *testing.T) {
func TestCommit(t *testing.T) { func TestCommit(t *testing.T) {
eng := NewTestEngine(t) eng := NewTestEngine(t)
b := &builder.BuilderJob{Engine: eng}
b.Install()
defer mkDaemonFromEngine(eng, t).Nuke() defer mkDaemonFromEngine(eng, t).Nuke()
config, _, _, err := parseRun([]string{unitTestImageID, "/bin/cat"}) config, _, _, err := parseRun([]string{unitTestImageID, "/bin/cat"})
@ -42,6 +45,8 @@ func TestCommit(t *testing.T) {
func TestMergeConfigOnCommit(t *testing.T) { func TestMergeConfigOnCommit(t *testing.T) {
eng := NewTestEngine(t) eng := NewTestEngine(t)
b := &builder.BuilderJob{Engine: eng}
b.Install()
runtime := mkDaemonFromEngine(eng, t) runtime := mkDaemonFromEngine(eng, t)
defer runtime.Nuke() defer runtime.Nuke()