From f1bd79ec97c125148c690d66ebd3ac5ab3f388b2 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 24 Mar 2014 12:03:41 +0000 Subject: [PATCH] Revert "fix failing test to use kill instead of stop" This reverts commit 4434dcee89f7d0d0239f6b492b24e940cdbafb21. Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- integration/server_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/integration/server_test.go b/integration/server_test.go index 617f81fa4..a401f1306 100644 --- a/integration/server_test.go +++ b/integration/server_test.go @@ -416,7 +416,7 @@ func TestRestartKillWait(t *testing.T) { }) } -func TestCreateStartRestartKillStartKillRm(t *testing.T) { +func TestCreateStartRestartStopStartKillRm(t *testing.T) { eng := NewTestEngine(t) srv := mkServerFromEngine(eng, t) defer mkRuntimeFromEngine(eng, t).Nuke() @@ -456,7 +456,8 @@ func TestCreateStartRestartKillStartKillRm(t *testing.T) { t.Fatal(err) } - job = eng.Job("kill", id) + job = eng.Job("stop", id) + job.SetenvInt("t", 15) if err := job.Run(); err != nil { t.Fatal(err) }