From af6aee3b8ac6cdd2b854d6debf91d4853bcc6afd Mon Sep 17 00:00:00 2001 From: Nick Ethier Date: Wed, 17 Jun 2020 14:01:17 -0400 Subject: [PATCH] fix test failures from rebase --- drivers/exec/driver_unix_test.go | 6 +++++- drivers/java/driver_test.go | 5 ++++- scheduler/generic_sched_test.go | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/exec/driver_unix_test.go b/drivers/exec/driver_unix_test.go index 243d4ea2e..cf1e838a3 100644 --- a/drivers/exec/driver_unix_test.go +++ b/drivers/exec/driver_unix_test.go @@ -120,7 +120,11 @@ func TestExec_dnsConfig(t *testing.T) { ctestutils.RequireRoot(t) ctestutils.ExecCompatible(t) require := require.New(t) - d := NewExecDriver(testlog.HCLogger(t)) + + ctx, cancel := context.WithCancel(context.Background()) + defer cancel() + + d := NewExecDriver(ctx, testlog.HCLogger(t)) harness := dtestutil.NewDriverHarness(t, d) defer harness.Kill() diff --git a/drivers/java/driver_test.go b/drivers/java/driver_test.go index fdedec050..b4c2c9e40 100644 --- a/drivers/java/driver_test.go +++ b/drivers/java/driver_test.go @@ -367,7 +367,10 @@ func Test_dnsConfig(t *testing.T) { ctestutil.RequireRoot(t) javaCompatible(t) require := require.New(t) - d := NewDriver(testlog.HCLogger(t)) + ctx, cancel := context.WithCancel(context.Background()) + defer cancel() + + d := NewDriver(ctx, testlog.HCLogger(t)) harness := dtestutil.NewDriverHarness(t, d) defer harness.Kill() diff --git a/scheduler/generic_sched_test.go b/scheduler/generic_sched_test.go index 66e326820..3390f0f1d 100644 --- a/scheduler/generic_sched_test.go +++ b/scheduler/generic_sched_test.go @@ -5204,6 +5204,7 @@ func TestServiceSched_Preemption(t *testing.T) { }, Networks: []*structs.NetworkResource{ { + Mode: "host", Device: "eth0", CIDR: "192.168.0.100/32", MBits: 1000,