Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm

fix failing test to use kill instead of stop
Upstream-commit: 56c156190ad61765086f30367d3c362a7673ad5c
Component: engine

components/engine/integration/server_test.go

@@ -416,7 +416,7 @@ func TestRestartKillWait(t *testing.T) {
 	})
 }
 
-func TestCreateStartRestartStopStartKillRm(t *testing.T) {
+func TestCreateStartRestartKillStartKillRm(t *testing.T) {
 	eng := NewTestEngine(t)
 	srv := mkServerFromEngine(eng, t)
 	defer mkRuntimeFromEngine(eng, t).Nuke()
@@ -456,8 +456,7 @@ func TestCreateStartRestartStopStartKillRm(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	job = eng.Job("stop", id)
-	job.SetenvInt("t", 15)
+	job = eng.Job("kill", id)
 	if err := job.Run(); err != nil {
 		t.Fatal(err)
 	}