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

Move "delete" to daemon/delete.go

Browse Source 
This is part of an effort to break apart the deprecated server/ package

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)

Fix issues with renaming container_delete to delete
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
This commit is contained in:
Solomon Hykes
2014-08-01 14:24:28 -04:00
committed by Tibor Vass
parent 066330fc96
commit cc39d579f5
7 changed files with 208 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/server/server.go
+1 -1
View File
@@ -678,7 +678,7 @@ func deleteContainers(eng *engine.Engine, version version.Version, w http.Respon
if vars == nil {
return fmt.Errorf("Missing parameter")
}
job := eng.Job("container_delete", vars["name"])
job := eng.Job("delete", vars["name"])
if version.GreaterThanOrEqualTo("1.14") {
job.Setenv("stop", r.Form.Get("stop"))
api/server/server_unit_test.go
+2 -2
View File
@@ -455,7 +455,7 @@ func TestDeleteContainers(t *testing.T) {
eng := engine.New()
name := "foo"
var called bool
eng.Register("container_delete", func(job *engine.Job) engine.Status {
eng.Register("delete", func(job *engine.Job) engine.Status {
called = true
if len(job.Args) == 0 {
t.Fatalf("Job arguments is empty")
@@ -480,7 +480,7 @@ func TestDeleteContainersWithStopAndKill(t *testing.T) {
}
eng := engine.New()
var called bool
eng.Register("container_delete", func(job *engine.Job) engine.Status {
eng.Register("delete", func(job *engine.Job) engine.Status {
called = true
return engine.StatusOK
})