clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 05:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

move commit to job

Browse Source
This commit is contained in:
Victor Vieux
2013-12-13 14:19:56 -08:00
parent aaa1c48d24
commit 930ec9f52c
5 changed files with 71 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/server_test.go
+16 -6
View File
@@ -146,7 +146,6 @@ func TestCreateRmVolumes(t *testing.T) {
func TestCommit(t *testing.T) {
eng := NewTestEngine(t)
srv := mkServerFromEngine(eng, t)
defer mkRuntimeFromEngine(eng, t).Nuke()
config, _, _, err := docker.ParseRun([]string{unitTestImageID, "/bin/cat"}, nil)
@@ -156,7 +155,12 @@ func TestCommit(t *testing.T) {
id := createTestContainer(eng, config, t)
if _, err := srv.ContainerCommit(id, "testrepo", "testtag", "", "", config); err != nil {
job := eng.Job("commit")
job.Setenv("container", id)
job.Setenv("repo", "testrepo")
job.Setenv("tag", "testtag")
job.SetenvJson("config", config)
if err := job.Run(); err != nil {
t.Fatal(err)
}
}
@@ -264,8 +268,12 @@ func TestRmi(t *testing.T) {
t.Fatal(err)
}
imageID, err := srv.ContainerCommit(containerID, "test", "", "", "", nil)
if err != nil {
job = eng.Job("commit")
job.Setenv("container", containerID)
job.Setenv("repo", "test")
var imageID string
job.Stdout.AddString(&imageID)
if err := job.Run(); err != nil {
t.Fatal(err)
}
@@ -288,8 +296,10 @@ func TestRmi(t *testing.T) {
t.Fatal(err)
}
_, err = srv.ContainerCommit(containerID, "test", "", "", "", nil)
if err != nil {
job = eng.Job("commit")
job.Setenv("container", containerID)
job.Setenv("repo", "test")
if err := job.Run(); err != nil {
t.Fatal(err)
}