luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

structs_test use testify require.True instead of t.Fatal

This commit is contained in:
Lang Martin 2019-04-23 17:00:11 -04:00
parent 8aa97cff13
commit 19ba0f4882
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nomad/structs/structs_test.go
View File

@ -620,57 +620,47 @@ func TestJob_RequiredSignals(t *testing.T) {
// test new Equal comparisons for components of Jobs // test new Equal comparisons for components of Jobs
func TestJob_PartEqual(t *testing.T) { func TestJob_PartEqual(t *testing.T) {
ns := &Networks{} ns := &Networks{}
if !ns.Equals(&Networks{}) { require.True(t, ns.Equals(&Networks{}))
t.Fatal("network set wise not equal")
}
ns = &Networks{ ns = &Networks{
&NetworkResource{Device: "eth0"}, &NetworkResource{Device: "eth0"},
} }
if !ns.Equals(&Networks{ require.True(t, ns.Equals(&Networks{
&NetworkResource{Device: "eth0"}, &NetworkResource{Device: "eth0"},
}) { }))
t.Fatal("network set wise not equal")
}
ns = &Networks{ ns = &Networks{
&NetworkResource{Device: "eth0"}, &NetworkResource{Device: "eth0"},
&NetworkResource{Device: "eth1"}, &NetworkResource{Device: "eth1"},
&NetworkResource{Device: "eth2"}, &NetworkResource{Device: "eth2"},
} }
if !ns.Equals(&Networks{ require.True(t, ns.Equals(&Networks{
&NetworkResource{Device: "eth2"}, &NetworkResource{Device: "eth2"},
&NetworkResource{Device: "eth0"}, &NetworkResource{Device: "eth0"},
&NetworkResource{Device: "eth1"}, &NetworkResource{Device: "eth1"},
}) { }))
t.Fatal("network set wise not equal")
}
cs := &Constraints{ cs := &Constraints{
&Constraint{"left0", "right0", "=", ""}, &Constraint{"left0", "right0", "=", ""},
&Constraint{"left1", "right1", "=", ""}, &Constraint{"left1", "right1", "=", ""},
&Constraint{"left2", "right2", "=", ""}, &Constraint{"left2", "right2", "=", ""},
} }
if !cs.Equals(&Constraints{ require.True(t, cs.Equals(&Constraints{
&Constraint{"left0", "right0", "=", ""}, &Constraint{"left0", "right0", "=", ""},
&Constraint{"left2", "right2", "=", ""}, &Constraint{"left2", "right2", "=", ""},
&Constraint{"left1", "right1", "=", ""}, &Constraint{"left1", "right1", "=", ""},
}) { }))
t.Fatal("constraint set wise not equal")
}
as := &Affinities{ as := &Affinities{
&Affinity{"left0", "right0", "=", 0, ""}, &Affinity{"left0", "right0", "=", 0, ""},
&Affinity{"left1", "right1", "=", 0, ""}, &Affinity{"left1", "right1", "=", 0, ""},
&Affinity{"left2", "right2", "=", 0, ""}, &Affinity{"left2", "right2", "=", 0, ""},
} }
if !as.Equals(&Affinities{ require.True(t, as.Equals(&Affinities{
&Affinity{"left0", "right0", "=", 0, ""}, &Affinity{"left0", "right0", "=", 0, ""},
&Affinity{"left2", "right2", "=", 0, ""}, &Affinity{"left2", "right2", "=", 0, ""},
&Affinity{"left1", "right1", "=", 0, ""}, &Affinity{"left1", "right1", "=", 0, ""},
}) { }))
t.Fatal("affinity set wise not equal")
}
} }
func TestTaskGroup_Validate(t *testing.T) { func TestTaskGroup_Validate(t *testing.T) {