diff --git a/nomad/structs/diff_test.go b/nomad/structs/diff_test.go index ee6a7d06e..956282b5a 100644 --- a/nomad/structs/diff_test.go +++ b/nomad/structs/diff_test.go @@ -676,13 +676,11 @@ func TestJobDiff(t *testing.T) { LTarget: "foo", RTarget: "foo", Operand: "foo", - str: "foo", }, { LTarget: "bar", RTarget: "bar", Operand: "bar", - str: "bar", }, }, }, @@ -692,13 +690,11 @@ func TestJobDiff(t *testing.T) { LTarget: "foo", RTarget: "foo", Operand: "foo", - str: "foo", }, { LTarget: "baz", RTarget: "baz", Operand: "baz", - str: "baz", }, }, }, @@ -1477,13 +1473,11 @@ func TestTaskGroupDiff(t *testing.T) { LTarget: "foo", RTarget: "foo", Operand: "foo", - str: "foo", }, { LTarget: "bar", RTarget: "bar", Operand: "bar", - str: "bar", }, }, }, @@ -1493,13 +1487,11 @@ func TestTaskGroupDiff(t *testing.T) { LTarget: "foo", RTarget: "foo", Operand: "foo", - str: "foo", }, { LTarget: "baz", RTarget: "baz", Operand: "baz", - str: "baz", }, }, }, @@ -4115,13 +4107,11 @@ func TestTaskDiff(t *testing.T) { LTarget: "foo", RTarget: "foo", Operand: "foo", - str: "foo", }, { LTarget: "bar", RTarget: "bar", Operand: "bar", - str: "bar", }, }, }, @@ -4131,13 +4121,11 @@ func TestTaskDiff(t *testing.T) { LTarget: "foo", RTarget: "foo", Operand: "foo", - str: "foo", }, { LTarget: "baz", RTarget: "baz", Operand: "baz", - str: "baz", }, }, }, diff --git a/nomad/structs/structs_test.go b/nomad/structs/structs_test.go index 0a4cedee3..e985dc8ad 100644 --- a/nomad/structs/structs_test.go +++ b/nomad/structs/structs_test.go @@ -797,14 +797,14 @@ func TestJob_PartEqual(t *testing.T) { })) cs := &Constraints{ - &Constraint{"left0", "right0", "=", ""}, - &Constraint{"left1", "right1", "=", ""}, - &Constraint{"left2", "right2", "=", ""}, + &Constraint{"left0", "right0", "="}, + &Constraint{"left1", "right1", "="}, + &Constraint{"left2", "right2", "="}, } require.True(t, cs.Equals(&Constraints{ - &Constraint{"left0", "right0", "=", ""}, - &Constraint{"left2", "right2", "=", ""}, - &Constraint{"left1", "right1", "=", ""}, + &Constraint{"left0", "right0", "="}, + &Constraint{"left2", "right2", "="}, + &Constraint{"left1", "right1", "="}, })) as := &Affinities{