From 185658507f1b9ae06fa4fa71d7174596b8ee1204 Mon Sep 17 00:00:00 2001 From: Matt Mercer Date: Wed, 1 Nov 2017 17:37:43 -0700 Subject: [PATCH] Qemu driver: defer cleanup sooner --- client/driver/qemu_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/client/driver/qemu_test.go b/client/driver/qemu_test.go index 9a74ca48b5d2..98a5de2c05fa 100644 --- a/client/driver/qemu_test.go +++ b/client/driver/qemu_test.go @@ -179,6 +179,13 @@ func TestQemuDriver_GracefulShutdown(t *testing.T) { t.Fatalf("err: %v", err) } + // Clean up + defer func() { + if err := resp.Handle.Kill(); err != nil { + logger.Printf("Error killing Qemu test: %s", err) + } + }() + // The monitor socket will not exist immediately, so we'll wait up to // 5 seconds for it to become available. monitorPath := fmt.Sprintf("%s/linux/%s", ctx.AllocDir.AllocDir, qemuMonitorSocketName) @@ -208,13 +215,6 @@ func TestQemuDriver_GracefulShutdown(t *testing.T) { if err := sendQemuShutdown(ctx.DriverCtx.logger, monitorPath, 0); err != nil { t.Fatalf("unexpected error from sendQemuShutdown: %s", err) } - - // Clean up - defer func() { - if err := resp.Handle.Kill(); err != nil { - logger.Printf("Error killing Qemu test: %s", err) - } - }() } func TestQemuDriverUser(t *testing.T) {