Merge branch 'r-executor-plugin' of github.com:hashicorp/nomad into r-executor-plugin

This commit is contained in:
Diptanu Choudhury
2016-02-09 10:17:44 -08:00
2 changed files with 10 additions and 3 deletions

View File

@@ -369,9 +369,10 @@ func TestExecDriver_Start_Kill_Wait(t *testing.T) {
Name: "sleep",
Config: map[string]interface{}{
"command": "/bin/sleep",
"args": []string{"45"},
"args": []string{"100"},
},
Resources: basicResources,
Resources: basicResources,
KillTimeout: 10 * time.Second,
}
driverCtx, execCtx := testDriverContexts(task)