Skip to content

Commit 71909ee

Browse files
committed
should've done this on linux I guess
1 parent c51e05f commit 71909ee

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

client/allocrunner/taskrunner/task_runner_linux_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,17 @@ import (
3939
cstate "github.com/hashicorp/nomad/client/state"
4040
cstructs "github.com/hashicorp/nomad/client/structs"
4141
"github.com/hashicorp/nomad/client/taskenv"
42-
"github.com/hashicorp/nomad/helper"
43-
structsc "github.com/hashicorp/nomad/nomad/structs/config"
44-
4542
ctestutil "github.com/hashicorp/nomad/client/testutil"
4643
"github.com/hashicorp/nomad/client/vaultclient"
4744
"github.com/hashicorp/nomad/client/widmgr"
4845
agentconsul "github.com/hashicorp/nomad/command/agent/consul"
4946
mockdriver "github.com/hashicorp/nomad/drivers/mock"
5047
"github.com/hashicorp/nomad/drivers/rawexec"
51-
"github.com/hashicorp/nomad/helper/pointer"
48+
"github.com/hashicorp/nomad/helper"
5249
"github.com/hashicorp/nomad/helper/testlog"
5350
"github.com/hashicorp/nomad/nomad/mock"
5451
"github.com/hashicorp/nomad/nomad/structs"
52+
structsc "github.com/hashicorp/nomad/nomad/structs/config"
5553
"github.com/hashicorp/nomad/plugins/device"
5654
"github.com/hashicorp/nomad/plugins/drivers"
5755
"github.com/hashicorp/nomad/plugins/drivers/fsisolation"

drivers/docker/driver_linux_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616

1717
"github.com/hashicorp/nomad/ci"
1818
"github.com/hashicorp/nomad/client/testutil"
19-
"github.com/hashicorp/nomad/helper/pointer"
2019
"github.com/shoenig/test/must"
2120
"github.com/shoenig/test/wait"
2221
)

nomad/structs/structs_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ func TestJob_Warnings(t *testing.T) {
716716
{
717717
Name: "Group services with group-level shutdown delay but no task-level shutdown delay set",
718718
Expected: []string{},
719-
Job: groupServiceJob(pointer.Of(time.Second)),
719+
Job: groupServiceJob(new(time.Second)),
720720
},
721721
{
722722
Name: "Group service references task without shutdown delay warning",
@@ -731,12 +731,12 @@ func TestJob_Warnings(t *testing.T) {
731731
{
732732
Name: "Connect sidecar task without 0 shutdown delay no warning",
733733
Expected: []string{},
734-
Job: connectSidecarServiceJob(pointer.Of(time.Duration(0))),
734+
Job: connectSidecarServiceJob(new(time.Duration(0))),
735735
},
736736
{
737737
Name: "Connect sidecar task with shutdown delay no warning",
738738
Expected: []string{},
739-
Job: connectSidecarServiceJob(pointer.Of(time.Second)),
739+
Job: connectSidecarServiceJob(new(time.Second)),
740740
},
741741
}
742742

0 commit comments

Comments
 (0)