From d4b8fc953aa50e4834eedc35d51bdca665011cdb Mon Sep 17 00:00:00 2001 From: Cameron Davison Date: Mon, 9 Jan 2017 15:55:50 -0600 Subject: [PATCH] using new ctx instead of getting both params back --- client/driver/docker_test.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/client/driver/docker_test.go b/client/driver/docker_test.go index 9ac374b5a..9b1e129d5 100644 --- a/client/driver/docker_test.go +++ b/client/driver/docker_test.go @@ -703,14 +703,13 @@ func TestDockerDriver_ForcePull_IsInvalidConfig(t *testing.T) { task, _, _ := dockerTask() task.Config["force_pull"] = "nothing" - driverCtx, execCtx := testDriverContexts(task) - driverCtx.config.Options = map[string]string{"docker.cleanup.image": "false"} - driver := NewDockerDriver(driverCtx) - if err := driver.Prestart(execCtx, task); err == nil { - execCtx.AllocDir.Destroy() + ctx := testDriverContexts(t, task) + defer ctx.AllocDir.Destroy() + ctx.DriverCtx.config.Options = map[string]string{"docker.cleanup.image": "false"} + driver := NewDockerDriver(ctx.DriverCtx) + + if err := driver.Prestart(ctx.ExecCtx, task); err == nil { t.Fatalf("error expected in prestart") - } else { - execCtx.AllocDir.Destroy() } }